Tweak tests for asserting exceptions