Merge "Fix log message on exception in setUpClass"