Add support for CATCH unit test