Added some users, unit test, and validate email