Refactored tests and added FactoryGirl