Whip together an EntityFactory mixin
Use entity factories in tests