added factorygirl and user tests