Switch to Catch Testing Framework