Remove: redundad tests
Add: tests for user