Updated tests for catch 1.0