Improved handling of Catch tests.  Changed some tests to use Catch rather than GTest.
Merge remote-tracking branch 'origin/next' into catch
Updated tags.
Updated Catch test target name.