Update catch unit test template.

- Second parameter to macro is optional
- We prefer CHECK to REQUIRE