user tests refactored
Merge pull request #104 from simensta/user-model-tests

user tests refactored