Updates to UsersResource
Merged updates
Updated userDAOTest