deleted two migrations
upgraded factorygirl syntax