diff --git a/lib/coek/test/CMakeLists.txt b/lib/coek/test/CMakeLists.txt
index 0a82e6c8..cea9d4f1 100644
--- a/lib/coek/test/CMakeLists.txt
+++ b/lib/coek/test/CMakeLists.txt
@@ -8,36 +8,36 @@ endif()
 
 
 SET(sources
-    test_model.cpp
-    test_visitor_simplify.cpp
-    test_visitor_mutable.cpp
-    test_visitor_writer.cpp
-    test_visitor_quadexpr.cpp
-    test_visitor_nlpexpr.cpp
-    test_visitor_symdiff.cpp
-    test_visitor_findvarparam.cpp
-    test_visitor_eval.cpp
-    test_testsolver.cpp
-    test_examples.cpp
-    test_writers.cpp
-    test_readers.cpp
-    test_sets.cpp
-    test_indexed.cpp
-    test_var.cpp
-    test_param.cpp
-    test_expr.cpp
-    test_obj.cpp
-    test_con.cpp
-    test_subexpression.cpp
-    test_autograd_unknown.cpp
-    test_autograd_all.cpp
-    test_util_sequence.cpp
+    smoke/test_model.cpp
+    smoke/test_visitor_simplify.cpp
+    smoke/test_visitor_mutable.cpp
+    smoke/test_visitor_writer.cpp
+    smoke/test_visitor_quadexpr.cpp
+    smoke/test_visitor_nlpexpr.cpp
+    smoke/test_visitor_symdiff.cpp
+    smoke/test_visitor_findvarparam.cpp
+    smoke/test_visitor_eval.cpp
+    smoke/test_testsolver.cpp
+    smoke/test_writers.cpp
+    smoke/test_readers.cpp
+    smoke/test_sets.cpp
+    smoke/test_indexed.cpp
+    smoke/test_var.cpp
+    smoke/test_param.cpp
+    smoke/test_expr.cpp
+    smoke/test_obj.cpp
+    smoke/test_con.cpp
+    smoke/test_subexpression.cpp
+    smoke/test_autograd_unknown.cpp
+    smoke/test_autograd_all.cpp
+    smoke/test_util_sequence.cpp
     mt_funcs.cpp
+    solver/test_examples.cpp
    )
 
 if (CMAKE_CXX_STANDARD GREATER_EQUAL 17)
     list(APPEND sources
-        test_util_DataPortal.cpp
+        smoke/test_util_DataPortal.cpp
         )
 endif()
 
@@ -47,14 +47,14 @@ set(coek_test_libraries)
 if(with_cppad)
   MESSAGE("-- Building Test with AD:        CppAd")
   list(APPEND sources
-    test_autograd_cppad.cpp)
+    smoke/test_autograd_cppad.cpp)
 endif()
 
 # ASL LIBRARY
 if(with_asl)
   MESSAGE("-- Building Test with AD:        ASL")
   list(APPEND sources
-    test_autograd_asl.cpp)
+    smoke/test_autograd_asl.cpp)
 endif()
 
 # Thread tests
diff --git a/lib/coek/test/test_autograd_all.cpp b/lib/coek/test/smoke/test_autograd_all.cpp
similarity index 100%
rename from lib/coek/test/test_autograd_all.cpp
rename to lib/coek/test/smoke/test_autograd_all.cpp
diff --git a/lib/coek/test/test_autograd_asl.cpp b/lib/coek/test/smoke/test_autograd_asl.cpp
similarity index 100%
rename from lib/coek/test/test_autograd_asl.cpp
rename to lib/coek/test/smoke/test_autograd_asl.cpp
diff --git a/lib/coek/test/test_autograd_cppad.cpp b/lib/coek/test/smoke/test_autograd_cppad.cpp
similarity index 100%
rename from lib/coek/test/test_autograd_cppad.cpp
rename to lib/coek/test/smoke/test_autograd_cppad.cpp
diff --git a/lib/coek/test/test_autograd_unknown.cpp b/lib/coek/test/smoke/test_autograd_unknown.cpp
similarity index 100%
rename from lib/coek/test/test_autograd_unknown.cpp
rename to lib/coek/test/smoke/test_autograd_unknown.cpp
diff --git a/lib/coek/test/test_con.cpp b/lib/coek/test/smoke/test_con.cpp
similarity index 100%
rename from lib/coek/test/test_con.cpp
rename to lib/coek/test/smoke/test_con.cpp
diff --git a/lib/coek/test/test_expr.cpp b/lib/coek/test/smoke/test_expr.cpp
similarity index 100%
rename from lib/coek/test/test_expr.cpp
rename to lib/coek/test/smoke/test_expr.cpp
diff --git a/lib/coek/test/test_indexed.cpp b/lib/coek/test/smoke/test_indexed.cpp
similarity index 100%
rename from lib/coek/test/test_indexed.cpp
rename to lib/coek/test/smoke/test_indexed.cpp
diff --git a/lib/coek/test/test_model.cpp b/lib/coek/test/smoke/test_model.cpp
similarity index 100%
rename from lib/coek/test/test_model.cpp
rename to lib/coek/test/smoke/test_model.cpp
diff --git a/lib/coek/test/test_obj.cpp b/lib/coek/test/smoke/test_obj.cpp
similarity index 100%
rename from lib/coek/test/test_obj.cpp
rename to lib/coek/test/smoke/test_obj.cpp
diff --git a/lib/coek/test/test_param.cpp b/lib/coek/test/smoke/test_param.cpp
similarity index 100%
rename from lib/coek/test/test_param.cpp
rename to lib/coek/test/smoke/test_param.cpp
diff --git a/lib/coek/test/test_readers.cpp b/lib/coek/test/smoke/test_readers.cpp
similarity index 100%
rename from lib/coek/test/test_readers.cpp
rename to lib/coek/test/smoke/test_readers.cpp
diff --git a/lib/coek/test/test_sets.cpp b/lib/coek/test/smoke/test_sets.cpp
similarity index 100%
rename from lib/coek/test/test_sets.cpp
rename to lib/coek/test/smoke/test_sets.cpp
diff --git a/lib/coek/test/test_subexpression.cpp b/lib/coek/test/smoke/test_subexpression.cpp
similarity index 100%
rename from lib/coek/test/test_subexpression.cpp
rename to lib/coek/test/smoke/test_subexpression.cpp
diff --git a/lib/coek/test/test_testsolver.cpp b/lib/coek/test/smoke/test_testsolver.cpp
similarity index 100%
rename from lib/coek/test/test_testsolver.cpp
rename to lib/coek/test/smoke/test_testsolver.cpp
diff --git a/lib/coek/test/test_util_DataPortal.cpp b/lib/coek/test/smoke/test_util_DataPortal.cpp
similarity index 100%
rename from lib/coek/test/test_util_DataPortal.cpp
rename to lib/coek/test/smoke/test_util_DataPortal.cpp
diff --git a/lib/coek/test/test_util_sequence.cpp b/lib/coek/test/smoke/test_util_sequence.cpp
similarity index 100%
rename from lib/coek/test/test_util_sequence.cpp
rename to lib/coek/test/smoke/test_util_sequence.cpp
diff --git a/lib/coek/test/test_var.cpp b/lib/coek/test/smoke/test_var.cpp
similarity index 100%
rename from lib/coek/test/test_var.cpp
rename to lib/coek/test/smoke/test_var.cpp
diff --git a/lib/coek/test/test_visitor_eval.cpp b/lib/coek/test/smoke/test_visitor_eval.cpp
similarity index 100%
rename from lib/coek/test/test_visitor_eval.cpp
rename to lib/coek/test/smoke/test_visitor_eval.cpp
diff --git a/lib/coek/test/test_visitor_findvarparam.cpp b/lib/coek/test/smoke/test_visitor_findvarparam.cpp
similarity index 100%
rename from lib/coek/test/test_visitor_findvarparam.cpp
rename to lib/coek/test/smoke/test_visitor_findvarparam.cpp
diff --git a/lib/coek/test/test_visitor_mutable.cpp b/lib/coek/test/smoke/test_visitor_mutable.cpp
similarity index 100%
rename from lib/coek/test/test_visitor_mutable.cpp
rename to lib/coek/test/smoke/test_visitor_mutable.cpp
diff --git a/lib/coek/test/test_visitor_nlpexpr.cpp b/lib/coek/test/smoke/test_visitor_nlpexpr.cpp
similarity index 100%
rename from lib/coek/test/test_visitor_nlpexpr.cpp
rename to lib/coek/test/smoke/test_visitor_nlpexpr.cpp
diff --git a/lib/coek/test/test_visitor_quadexpr.cpp b/lib/coek/test/smoke/test_visitor_quadexpr.cpp
similarity index 100%
rename from lib/coek/test/test_visitor_quadexpr.cpp
rename to lib/coek/test/smoke/test_visitor_quadexpr.cpp
diff --git a/lib/coek/test/test_visitor_simplify.cpp b/lib/coek/test/smoke/test_visitor_simplify.cpp
similarity index 100%
rename from lib/coek/test/test_visitor_simplify.cpp
rename to lib/coek/test/smoke/test_visitor_simplify.cpp
diff --git a/lib/coek/test/test_visitor_symdiff.cpp b/lib/coek/test/smoke/test_visitor_symdiff.cpp
similarity index 100%
rename from lib/coek/test/test_visitor_symdiff.cpp
rename to lib/coek/test/smoke/test_visitor_symdiff.cpp
diff --git a/lib/coek/test/test_visitor_writer.cpp b/lib/coek/test/smoke/test_visitor_writer.cpp
similarity index 100%
rename from lib/coek/test/test_visitor_writer.cpp
rename to lib/coek/test/smoke/test_visitor_writer.cpp
diff --git a/lib/coek/test/test_writers.cpp b/lib/coek/test/smoke/test_writers.cpp
similarity index 100%
rename from lib/coek/test/test_writers.cpp
rename to lib/coek/test/smoke/test_writers.cpp
diff --git a/lib/coek/test/test_examples.cpp b/lib/coek/test/solver/test_examples.cpp
similarity index 100%
rename from lib/coek/test/test_examples.cpp
rename to lib/coek/test/solver/test_examples.cpp