Switched from CUnit to Catch for testing framework