Hack around breakages in unittests from changes in test fixtures