Added user and model tests
Removed user-specific files