update factory_girl and refactor some specs