Merge "Convert cleanup with addClassResourceCleanup in endpoint test"