fix + add tests
Merge branch 'PersistenceRefactoring' of https://github.com/teanutella/AppEmployee into PersistenceRefactoring