Migrated remaining tests to Catch