Switched tests to use Catch.