NUM-156: Better exception testing