Holy mother of rewrites.
Use factories in tests