Fix a couple @expectedException tests to, well, match the expected exception...