Romoved 'test builders', used TestObjectFactories in tests

see #311