Merge "Use addClassResourceCleanup for cleanup in test_regions"