Fixed bugs in make_test_data / deleted tests.data_factories

All the methods in core.tests.data_factories have been deleted and the tests using those are now using the improved make_test_data method from util.factories.
Curiously the tests are running considerably faster on my machine now