Porting tests to CTest & Catch