4 files changed, 1 insertions, 9 deletions
diff --git a/unittest/test.cc b/unittest/test.cc
index 99f96ac..15235bd 100644
--- a/unittest/test.cc
+++ b/unittest/test.cc
@@ -1,4 +1,3 @@
-#define CATCH_CONFIG_MAIN  // This tells Catch to provide a main()
 #include "catch.hpp"
 
 #include <iostream>
diff --git a/unittest/test2.cc b/unittest/test2.cc
index 4b61a3c..31dbce8 100644
--- a/unittest/test2.cc
+++ b/unittest/test2.cc
@@ -1,4 +1,3 @@
-#define CATCH_CONFIG_MAIN  // This tells Catch to provide a main()
 
 static const char *const default_admin_pin = "12345678";
 static const char *const default_user_pin = "123456";
diff --git a/unittest/test3.cc b/unittest/test3.cc
index 215df78..5302044 100644
--- a/unittest/test3.cc
+++ b/unittest/test3.cc
@@ -1,8 +1,3 @@
-//
-// Created by sz on 08.11.16.
-//
-
-#define CATCH_CONFIG_MAIN  // This tells Catch to provide a main()
 
 static const char *const default_admin_pin = "12345678";
 static const char *const default_user_pin = "123456";
diff --git a/unittest/test_HOTP.cc b/unittest/test_HOTP.cc
index c6b62a3..e6f7d7c 100644
--- a/unittest/test_HOTP.cc
+++ b/unittest/test_HOTP.cc
@@ -1,4 +1,3 @@
-#define CATCH_CONFIG_MAIN  // This tells Catch to provide a main()
 #include "catch.hpp"
 #include <iostream>
 #include "device_proto.h"
@@ -14,7 +13,7 @@ using namespace nitrokey::log;
 using namespace nitrokey::misc;
 
 void hexStringToByte(uint8_t data[], const char* hexString){
-    assert(strlen(hexString)%2==0);
+  REQUIRE(strlen(hexString)%2==0);
     char buf[2];
     for(int i=0; i<strlen(hexString); i++){
         buf[i%2] = hexString[i];