Added FactoryGirl and more tests