#278

Should go into StubFactory