Refactored tests to use factory girl
Added user test, need to finish it