More tests and refactoring of persistence tests
fixed tests and added resolver