[P] - final persistence integration, better mocks