diff --git a/cmd_line_main.c b/cmd_line_main.c
index 87d0ecd..63c670c 100644
--- a/cmd_line_main.c
+++ b/cmd_line_main.c
@@ -25,24 +25,22 @@
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
  */
+//  Created by Laurence Lundblade on 9/13/18.
 
 #include <stdio.h>
 
-#include "basic_test.h"
-#include "bstrwrap_tests.h"
+#include "run_tests.h"
 
-int main(int argc, const char * argv[]) {
 
-    printf("basic-test_one Result %d\n", basic_test_one());
+int fputs_wrapper(const char *szString, void *ctx)
+{
+    return fputs(szString, (FILE *)ctx);
+}
 
-    printf("cose_sign1_tbs_test %d\n", cose_sign1_tbs_test());
 
-    printf("bstr_wrap_nest_test %d\n", bstr_wrap_nest_test());
-    
-    printf("bstr_wrap_error_test %d\n", bstr_wrap_error_test());
-    
-    printf("bstrwraptest %d\n", bstrwraptest());
-    
-    
-    return 0;
+int main(int argc, const char * argv[]) {   
+   
+    int nNumTestsFailed = run_tests(&fputs_wrapper, stdout, NULL);
+
+    return nNumTestsFailed;
 }