Fix some broken tests from the setExpectedException rename