Refactor specs and routes
Finish user spec"