Fix remaining test_mixed_modulestore tests.