mockito only stereotype, test refactoring

mockito test only with stereotypes
own unit tests refactored
setup-test-persistence => test-persistence
test refactored