Removed fixtures and replaced with FactoryGirlfor testing