Factory girl tests fixed, but with dubious solution of saving each