Switch to Catch2

Switch to Catch2