Closes #311 - Removed 'test builders', used TestObjectFactories in tests