Fixed user tests to use FactoryGirl