Completing userDao refactorings, including unit tests on UserDao