diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d95ecc..65a22a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ add_executable (xsiesta_test)
 target_link_libraries (xsiesta_test PUBLIC stell)
 target_compile_features (xsiesta_test PRIVATE cxx_std_11)
 
-add_executable (xiesta_unit_tests)
-target_link_libraries (xiesta_unit_tests PUBLIC siesta)
+add_executable (xsiesta_unit_tests)
+target_link_libraries (xsiesta_unit_tests PUBLIC siesta)
 
 add_subdirectory (Testing)
diff --git a/Testing/test_utilities/CMakeLists.txt b/Testing/test_utilities/CMakeLists.txt
index 18a230c..771e435 100644
--- a/Testing/test_utilities/CMakeLists.txt
+++ b/Testing/test_utilities/CMakeLists.txt
@@ -10,7 +10,7 @@ target_sources(xsiesta_test
                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/commandline_parser.hpp>
 )
 
-target_sources(xiesta_unit_tests
+target_sources(xsiesta_unit_tests
                PRIVATE
                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/siesta_unit_tests.f>
 )
diff --git a/Testing/tests/siesta_final_test/CMakeLists.txt b/Testing/tests/siesta_final_test/CMakeLists.txt
index db2c50f..e7c38c5 100644
--- a/Testing/tests/siesta_final_test/CMakeLists.txt
+++ b/Testing/tests/siesta_final_test/CMakeLists.txt
@@ -37,7 +37,7 @@ set_tests_properties (siesta_final_chipf_test
                       PROPERTIES
                       DEPENDS "siesta_final_vmec_test;siesta_final_siesta_test")
 add_test (NAME    siesta_final_phipf_test
-          COMMAND $<TARGET_PROPERTY:xsiesta_test,BINARY_DIR>/xsiesta_test -wout_file=${CMAKE_CURRENT_BINARY_DIR}/wout_test.vmec.nc -restart_file=${CMAKE_CURRENT_BINARY_DIR}/siesta_restart_w7x.nc -test_name=phipf -min=0.0 -max=1.0 -tol=8.7E-18)
+          COMMAND $<TARGET_PROPERTY:xsiesta_test,BINARY_DIR>/xsiesta_test -wout_file=${CMAKE_CURRENT_BINARY_DIR}/wout_test.vmec.nc -restart_file=${CMAKE_CURRENT_BINARY_DIR}/siesta_restart_w7x.nc -test_name=phipf -min=0.0 -max=1.0 -tol=1.1E-17)
 set_tests_properties (siesta_final_phipf_test
                       PROPERTIES
                       DEPENDS "siesta_final_vmec_test;siesta_final_siesta_test")
@@ -150,7 +150,7 @@ set_tests_properties (siesta_final_jbsups_test
                       PROPERTIES
                       DEPENDS "siesta_final_vmec_test;siesta_final_siesta_test")
 add_test (NAME    siesta_final_jbsupu_test
-          COMMAND $<TARGET_PROPERTY:xsiesta_test,BINARY_DIR>/xsiesta_test -wout_file=${CMAKE_CURRENT_BINARY_DIR}/wout_test.vmec.nc -restart_file=${CMAKE_CURRENT_BINARY_DIR}/siesta_restart_w7x.nc -test_name=jbsupu -min=0.0 -max=1.0 -tol=5.0E-5)
+          COMMAND $<TARGET_PROPERTY:xsiesta_test,BINARY_DIR>/xsiesta_test -wout_file=${CMAKE_CURRENT_BINARY_DIR}/wout_test.vmec.nc -restart_file=${CMAKE_CURRENT_BINARY_DIR}/siesta_restart_w7x.nc -test_name=jbsupu -min=0.0 -max=1.0 -tol=5.1E-5)
 set_tests_properties (siesta_final_jbsupu_test
                       PROPERTIES
                       DEPENDS "siesta_final_vmec_test;siesta_final_siesta_test")
@@ -177,7 +177,7 @@ set_tests_properties (siesta_final_jksupu_test
                       PROPERTIES
                       DEPENDS "siesta_final_vmec_test;siesta_final_siesta_test")
 add_test (NAME    siesta_final_jksupv_test
-          COMMAND $<TARGET_PROPERTY:xsiesta_test,BINARY_DIR>/xsiesta_test -wout_file=${CMAKE_CURRENT_BINARY_DIR}/wout_test.vmec.nc -restart_file=${CMAKE_CURRENT_BINARY_DIR}/siesta_restart_w7x.nc -test_name=jbsupv -min=0.0 -max=1.0 -tol=0.97 -relative)
+          COMMAND $<TARGET_PROPERTY:xsiesta_test,BINARY_DIR>/xsiesta_test -wout_file=${CMAKE_CURRENT_BINARY_DIR}/wout_test.vmec.nc -restart_file=${CMAKE_CURRENT_BINARY_DIR}/siesta_restart_w7x.nc -test_name=jbsupv -min=0.0 -max=1.0 -tol=0.99 -relative)
 set_tests_properties (siesta_final_jksupv_test
                       PROPERTIES
                       DEPENDS "siesta_final_vmec_test;siesta_final_siesta_test")
diff --git a/Testing/tests/siesta_init_test/CMakeLists.txt b/Testing/tests/siesta_init_test/CMakeLists.txt
index ba0c040..de625a8 100644
--- a/Testing/tests/siesta_init_test/CMakeLists.txt
+++ b/Testing/tests/siesta_init_test/CMakeLists.txt
@@ -150,7 +150,7 @@ set_tests_properties (siesta_init_jbsups_test
                       PROPERTIES
                       DEPENDS "siesta_init_vmec_test;siesta_init_siesta_test")
 add_test (NAME    siesta_init_jbsupu_test
-          COMMAND $<TARGET_PROPERTY:xsiesta_test,BINARY_DIR>/xsiesta_test -wout_file=${CMAKE_CURRENT_BINARY_DIR}/wout_test.vmec.nc -restart_file=${CMAKE_CURRENT_BINARY_DIR}/siesta_restart_w7x.nc -test_name=jbsupu -min=0.0 -max=1.0 -tol=4.9E-5)
+          COMMAND $<TARGET_PROPERTY:xsiesta_test,BINARY_DIR>/xsiesta_test -wout_file=${CMAKE_CURRENT_BINARY_DIR}/wout_test.vmec.nc -restart_file=${CMAKE_CURRENT_BINARY_DIR}/siesta_restart_w7x.nc -test_name=jbsupu -min=0.0 -max=1.0 -tol=5.1E-5)
 set_tests_properties (siesta_init_jbsupu_test
                       PROPERTIES
                       DEPENDS "siesta_init_vmec_test;siesta_init_siesta_test")
@@ -215,7 +215,7 @@ set_tests_properties (siesta_init_jksupu_test
                       PROPERTIES
                       DEPENDS "siesta_init_vmec_test;siesta_init_siesta_test")
 add_test (NAME    siesta_init_jksupv_test
-          COMMAND $<TARGET_PROPERTY:xsiesta_test,BINARY_DIR>/xsiesta_test -wout_file=${CMAKE_CURRENT_BINARY_DIR}/wout_test.vmec.nc -restart_file=${CMAKE_CURRENT_BINARY_DIR}/siesta_restart_w7x.nc -test_name=jbsupv -min=0.0 -max=1.0 -tol=0.97 -relative)
+          COMMAND $<TARGET_PROPERTY:xsiesta_test,BINARY_DIR>/xsiesta_test -wout_file=${CMAKE_CURRENT_BINARY_DIR}/wout_test.vmec.nc -restart_file=${CMAKE_CURRENT_BINARY_DIR}/siesta_restart_w7x.nc -test_name=jbsupv -min=0.0 -max=1.0 -tol=0.98 -relative)
 set_tests_properties (siesta_init_jksupv_test
                       PROPERTIES
                       DEPENDS "siesta_init_vmec_test;siesta_init_siesta_test")
diff --git a/Testing/tests/siesta_unit_tests/CMakeLists.txt b/Testing/tests/siesta_unit_tests/CMakeLists.txt
index ac98ff5..b8bf7ea 100644
--- a/Testing/tests/siesta_unit_tests/CMakeLists.txt
+++ b/Testing/tests/siesta_unit_tests/CMakeLists.txt
@@ -1,3 +1,3 @@
 #  Run SIESTA unit tests.
 add_test (NAME    siesta_unit_tests
-          COMMAND $<TARGET_PROPERTY:xiesta_unit_tests,BINARY_DIR>/xiesta_unit_tests)
+          COMMAND $<TARGET_PROPERTY:xsiesta_unit_tests,BINARY_DIR>/xsiesta_unit_tests)