Merge "Use addClassResourceCleanup in test_list_projects"