Add User controller and routes
Refactored tests and helpers
Fix conflicts