Fix the inheritance hierarchy of these tests.
2 files changed