Merge "Use addClassResourceCleanup in test_inherits"