Merge "Removes redundant tearDownClass methods"