Merge "Fix inheritance for BaseTestCase"