Improved tests to use Catch idioms