refactored some tests
created User model