rolled back some mistakes with factorygirl, removed better-errors