Refactored more specs to use factorygirl