Modified some tests after refactoring persistence stuff
Modified some test after refactoring persistence stuff