Added some tests for User and UserToken models.
Minor Refactoring of tests.