Changed code depending on the comments. Added a test for user controller. Convention changes.