Merge "Add unit tests for not overriding setUpClass"