Fix the inheritance hierarchy of these tests.