Enhancement user model testing take2

Adding up more assertions and cleaning up the hard coded email strings in the tests.