Corrected some tests that for some reason were clobbered to the best of my knowledge
Merge branch 'james_mocha_tests' into dev

Conflicts:
	app/tests/user.server.model.test.js