diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index df8bf86..fb07c2c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,151 +1,151 @@
 ##################### External packages #########################
 
 find_package(CxxTest)          # Necessary if you want the tests
 
 # catch for unit testing
 include(ExternalProject)
 find_package(Git REQUIRED)
 
 ExternalProject_Add(
     catch
     PREFIX ${CMAKE_BINARY_DIR}/catch
     GIT_REPOSITORY https://github.com/philsquared/Catch.git
     TIMEOUT 10
     UPDATE_COMMAND ${GIT_EXECUTABLE} pull
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     LOG_DOWNLOAD ON
    )
 
 ################## Configuration ################################
 
 set(PROJECT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 ExternalProject_Get_Property(catch source_dir)
 set(CATCH_INCLUDE_DIR ${source_dir}/include CACHE INTERNAL "Path to include folder for Catch")
 
 
 include_directories(${CATCH_INCLUDE_DIR})
 include_directories(${PROJECT_TEST_DIR})
 ################## Tests ########################################
 
 enable_testing(true)
 
 # CXX Test
 # ========
 
 if(CXXTEST_FOUND)
     set(CXXTEST_USE_PYTHON TRUE)
     include_directories(${CXXTEST_INCLUDE_DIR})
     enable_testing()
 
     # MiCP Solver
     # ------------
     CXXTEST_ADD_TEST(test_cond_number
                      test_cond_number.cpp
                      ${PROJECT_TEST_DIR}/micpsolver/test_cond_number.hpp)
 
     CXXTEST_ADD_TEST(test_ncp_funtion
                      test_ncp_function.cpp
                      ${PROJECT_TEST_DIR}/micpsolver/test_ncp_function.hpp)
 
     CXXTEST_ADD_TEST(test_micpsolver
                      test_micpsolver.cpp
                      ${PROJECT_TEST_DIR}/micpsolver/test_micpsolver.hpp)
 
     # Database
     # --------
 
     CXXTEST_ADD_TEST(test_data_reader
                     test_data_reader.cpp
                     ${PROJECT_TEST_DIR}/database/test_data_reader.hpp)
     target_link_libraries(test_data_reader specmicp_database jsoncpp)
 
 
     CXXTEST_ADD_TEST(test_data_selector
                     test_data_selector.cpp
                     ${PROJECT_TEST_DIR}/database/test_data_selector.hpp)
     target_link_libraries(test_data_selector specmicp_database jsoncpp)
 
     # Odeint
     # ------
 
     CXXTEST_ADD_TEST(test_butchertableau
                      test_butchertableau.cpp
                      ${PROJECT_TEST_DIR}/odeint/test_butchertableau.hpp)
 
 
     CXXTEST_ADD_TEST(test_embeddedrungekutta
                      test_embeddedrungekutta.cpp
                      ${PROJECT_TEST_DIR}/odeint/test_embeddedrungekutta.hpp)
 
 endif()
 
 # Test 'Perso'
 # ============
 
 add_executable(thermocarbo ${PROJECT_TEST_DIR}/specmicp/thermocarbo.cpp)
 target_link_libraries(thermocarbo specmicp specmicp_database jsoncpp)
 
 add_executable(carboalu ${PROJECT_TEST_DIR}/specmicp/carboalu.cpp)
 target_link_libraries(carboalu specmicp specmicp_database jsoncpp)
 
 add_executable(alkaliactivated ${PROJECT_TEST_DIR}/specmicp/alkaliactivated.cpp)
 target_link_libraries(alkaliactivated specmicp specmicp_database jsoncpp)
 
 add_executable(rate_nicoleau ${PROJECT_TEST_DIR}/specmicp/rate_nicoleau.cpp)
 target_link_libraries(rate_nicoleau specmicp specmicp_database jsoncpp)
 
 add_executable(kinetics ${PROJECT_TEST_DIR}/specmicp/kinetics.cpp)
 target_link_libraries(kinetics specmicp specmicp_database jsoncpp)
 
 
 set(DATA_TEST ${PROJECT_TEST_DIR}/specmicp/data_test/data_nicoleau_c3sm.csv
               ${PROJECT_TEST_DIR}/specmicp/data_test/data_nicoleau_c3st1.csv
               ${PROJECT_TEST_DIR}/specmicp/data_test/data_nicoleau_c3st2.csv
 )
 
 add_custom_target(data_nicoleau SOURCES ${DATA_TEST})
 
 file(INSTALL ${DATA_TEST}
      DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/data_test/)
 
 # Catch test
 #===========
 
 # Database
 # --------
 
 add_custom_target(catch_header SOURCES test_database.hpp)
 
 add_executable(test_reactmicp_diffusion
-    ${PROJECT_TEST_DIR}/reactmip/systems/diffusion/test_reactmicp_diffusion.cpp
-    ${PROJECT_TEST_DIR}/reactmip/systems/diffusion/diffusion.cpp
-    ${PROJECT_TEST_DIR}/reactmip/systems/diffusion/numbering.cpp
-    ${PROJECT_TEST_DIR}/reactmip/systems/diffusion/secondary.cpp
-    ${PROJECT_TEST_DIR}/reactmip/systems/diffusion/solving.cpp
-    ${PROJECT_TEST_DIR}/reactmip/systems/diffusion/utils.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/diffusion/test_reactmicp_diffusion.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/diffusion/diffusion.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/diffusion/numbering.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/diffusion/secondary.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/diffusion/solving.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/diffusion/utils.cpp
 )
 target_link_libraries(test_reactmicp_diffusion reactmicp specmicp specmicp_database jsoncpp)
 
 # Mesh
 # ----
 
 add_executable(test_meshes
-    ${PROJECT_TEST_DIR}/reactmip/meshes/test_meshes.cpp
-    ${PROJECT_TEST_DIR}/reactmip/meshes/test_uniform_mesh_1d.cpp
-    ${PROJECT_TEST_DIR}/reactmip/meshes/test_axisymmetric_uniform_mesh_1d.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/meshes/test_meshes.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/meshes/test_uniform_mesh_1d.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/meshes/test_axisymmetric_uniform_mesh_1d.cpp
 )
 
 # Saturated Diffusion
 # -------------------
 
 add_executable(test_reactmicp_saturated_diffusion
-    ${PROJECT_TEST_DIR}/reactmip/systems/saturated_diffusion/test_reactmicp_saturated_diffusion.cpp
-    ${PROJECT_TEST_DIR}/reactmip/systems/saturated_diffusion/variables.cpp
-    ${PROJECT_TEST_DIR}/reactmip/systems/saturated_diffusion/solver.cpp
-    ${PROJECT_TEST_DIR}/reactmip/systems/saturated_diffusion/transport_program.cpp
-    ${PROJECT_TEST_DIR}/reactmip/systems/saturated_diffusion/reactive_transport.cpp
-    ${PROJECT_TEST_DIR}/reactmip/systems/saturated_diffusion/utils.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/saturated_diffusion/test_reactmicp_saturated_diffusion.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/saturated_diffusion/variables.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/saturated_diffusion/solver.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/saturated_diffusion/transport_program.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/saturated_diffusion/reactive_transport.cpp
+    ${PROJECT_TEST_DIR}/reactmicp/systems/saturated_diffusion/utils.cpp
 )
 target_link_libraries(test_reactmicp_saturated_diffusion reactmicp specmicp specmicp_database jsoncpp)
diff --git a/tests/reactmip/meshes/test_axisymmetric_uniform_mesh_1d.cpp b/tests/reactmicp/meshes/test_axisymmetric_uniform_mesh_1d.cpp
similarity index 100%
rename from tests/reactmip/meshes/test_axisymmetric_uniform_mesh_1d.cpp
rename to tests/reactmicp/meshes/test_axisymmetric_uniform_mesh_1d.cpp
diff --git a/tests/reactmip/meshes/test_meshes.cpp b/tests/reactmicp/meshes/test_meshes.cpp
similarity index 100%
rename from tests/reactmip/meshes/test_meshes.cpp
rename to tests/reactmicp/meshes/test_meshes.cpp
diff --git a/tests/reactmip/meshes/test_uniform_mesh_1d.cpp b/tests/reactmicp/meshes/test_uniform_mesh_1d.cpp
similarity index 100%
rename from tests/reactmip/meshes/test_uniform_mesh_1d.cpp
rename to tests/reactmicp/meshes/test_uniform_mesh_1d.cpp
diff --git a/tests/reactmip/systems/diffusion/diffusion.cpp b/tests/reactmicp/systems/diffusion/diffusion.cpp
similarity index 100%
rename from tests/reactmip/systems/diffusion/diffusion.cpp
rename to tests/reactmicp/systems/diffusion/diffusion.cpp
diff --git a/tests/reactmip/systems/diffusion/numbering.cpp b/tests/reactmicp/systems/diffusion/numbering.cpp
similarity index 100%
rename from tests/reactmip/systems/diffusion/numbering.cpp
rename to tests/reactmicp/systems/diffusion/numbering.cpp
diff --git a/tests/reactmip/systems/diffusion/secondary.cpp b/tests/reactmicp/systems/diffusion/secondary.cpp
similarity index 100%
rename from tests/reactmip/systems/diffusion/secondary.cpp
rename to tests/reactmicp/systems/diffusion/secondary.cpp
diff --git a/tests/reactmip/systems/diffusion/solving.cpp b/tests/reactmicp/systems/diffusion/solving.cpp
similarity index 100%
rename from tests/reactmip/systems/diffusion/solving.cpp
rename to tests/reactmicp/systems/diffusion/solving.cpp
diff --git a/tests/reactmip/systems/diffusion/test_reactmicp_diffusion.cpp b/tests/reactmicp/systems/diffusion/test_reactmicp_diffusion.cpp
similarity index 100%
rename from tests/reactmip/systems/diffusion/test_reactmicp_diffusion.cpp
rename to tests/reactmicp/systems/diffusion/test_reactmicp_diffusion.cpp
diff --git a/tests/reactmip/systems/diffusion/utils.cpp b/tests/reactmicp/systems/diffusion/utils.cpp
similarity index 100%
rename from tests/reactmip/systems/diffusion/utils.cpp
rename to tests/reactmicp/systems/diffusion/utils.cpp
diff --git a/tests/reactmip/systems/diffusion/utils.hpp b/tests/reactmicp/systems/diffusion/utils.hpp
similarity index 100%
rename from tests/reactmip/systems/diffusion/utils.hpp
rename to tests/reactmicp/systems/diffusion/utils.hpp
diff --git a/tests/reactmip/systems/saturated_diffusion/reactive_transport.cpp b/tests/reactmicp/systems/saturated_diffusion/reactive_transport.cpp
similarity index 100%
rename from tests/reactmip/systems/saturated_diffusion/reactive_transport.cpp
rename to tests/reactmicp/systems/saturated_diffusion/reactive_transport.cpp
diff --git a/tests/reactmip/systems/saturated_diffusion/solver.cpp b/tests/reactmicp/systems/saturated_diffusion/solver.cpp
similarity index 100%
rename from tests/reactmip/systems/saturated_diffusion/solver.cpp
rename to tests/reactmicp/systems/saturated_diffusion/solver.cpp
diff --git a/tests/reactmip/systems/saturated_diffusion/test_reactmicp_saturated_diffusion.cpp b/tests/reactmicp/systems/saturated_diffusion/test_reactmicp_saturated_diffusion.cpp
similarity index 100%
rename from tests/reactmip/systems/saturated_diffusion/test_reactmicp_saturated_diffusion.cpp
rename to tests/reactmicp/systems/saturated_diffusion/test_reactmicp_saturated_diffusion.cpp
diff --git a/tests/reactmip/systems/saturated_diffusion/transport_program.cpp b/tests/reactmicp/systems/saturated_diffusion/transport_program.cpp
similarity index 100%
rename from tests/reactmip/systems/saturated_diffusion/transport_program.cpp
rename to tests/reactmicp/systems/saturated_diffusion/transport_program.cpp
diff --git a/tests/reactmip/systems/saturated_diffusion/utils.cpp b/tests/reactmicp/systems/saturated_diffusion/utils.cpp
similarity index 100%
rename from tests/reactmip/systems/saturated_diffusion/utils.cpp
rename to tests/reactmicp/systems/saturated_diffusion/utils.cpp
diff --git a/tests/reactmip/systems/saturated_diffusion/utils.hpp b/tests/reactmicp/systems/saturated_diffusion/utils.hpp
similarity index 100%
rename from tests/reactmip/systems/saturated_diffusion/utils.hpp
rename to tests/reactmicp/systems/saturated_diffusion/utils.hpp
diff --git a/tests/reactmip/systems/saturated_diffusion/variables.cpp b/tests/reactmicp/systems/saturated_diffusion/variables.cpp
similarity index 100%
rename from tests/reactmip/systems/saturated_diffusion/variables.cpp
rename to tests/reactmicp/systems/saturated_diffusion/variables.cpp