[TASK] Follow-up to "Add functional tests for generic persistence"