Improved handling of Catch tests.