Changed fields to fName and lName by Calvins direction and added new tests.
Added more tests
MOAR TESTS
Added more tests
Added more tests
Merge branch 'james_mocha_tests' into dev

Merching tests for user