Merge "Handle failures from Before/AfterClass in the runner" into main