Unittests converted to the Catch framework