Improved handling of Catch tests.  Changed some tests to use Catch rather than GTest.