Cleaned up unit testing
Moved building of user to factory girl