Factory and use spec cleanup