Merge "Remove setUpClass added after cleanup"