Fixed test errors
Merge branch 'master' of /home/vlad/SampleUserManagement with conflicts.