Fix FakeFactory to comply to new interface