diff --git a/free_boundary/external_magnetic_field/BUILD.bazel b/free_boundary/external_magnetic_field/BUILD.bazel
index 47741c3..239f695 100644
--- a/free_boundary/external_magnetic_field/BUILD.bazel
+++ b/free_boundary/external_magnetic_field/BUILD.bazel
@@ -5,7 +5,9 @@ cc_test(
     name = "external_magnetic_field_test",
     srcs = ["external_magnetic_field_test.cc"],
     data = [
+        "//vmecpp/test_data:solovev_free_bdy",
         "//vmecpp/test_data:cth_like_free_bdy",
+        "//vmecpp_large_cpp_tests/test_data:solovev_free_bdy",
         "//vmecpp_large_cpp_tests/test_data:cth_like_free_bdy",
     ],
     deps = [
diff --git a/free_boundary/external_magnetic_field/external_magnetic_field_test.cc b/free_boundary/external_magnetic_field/external_magnetic_field_test.cc
index ce8e511..aa3a926 100644
--- a/free_boundary/external_magnetic_field/external_magnetic_field_test.cc
+++ b/free_boundary/external_magnetic_field/external_magnetic_field_test.cc
@@ -150,9 +150,13 @@ TEST_P(ExternalMagneticFieldTest, CheckExternalMagneticField) {
 // NOTE: tolerance is a little more loose here, since Fortran VMEC still uses
 // the bsc_t old Biot-Savart module, whereas VMEC++ uses ABSCAB. (The mgrid file
 // can be computed using ABSCAB already via //makegrid/makegrid_standalone.)
-INSTANTIATE_TEST_SUITE_P(TestExternalMagneticField, ExternalMagneticFieldTest,
-                         Values(DataSource{.identifier = "cth_like_free_bdy",
-                                           .tolerance = 1.0e-10,
-                                           .iter2_to_test = {53, 54}}));
+INSTANTIATE_TEST_SUITE_P(
+    TestExternalMagneticField, ExternalMagneticFieldTest,
+    Values(DataSource{.identifier = "solovev_free_bdy",
+                      .tolerance = 1.0e-10,
+                      .iter2_to_test = {3}},
+           DataSource{.identifier = "cth_like_free_bdy",
+                      .tolerance = 1.0e-10,
+                      .iter2_to_test = {53, 54}}));
 
 }  // namespace vmecpp
diff --git a/free_boundary/mgrid_provider/BUILD.bazel b/free_boundary/mgrid_provider/BUILD.bazel
index ba98ad0..aa42dca 100644
--- a/free_boundary/mgrid_provider/BUILD.bazel
+++ b/free_boundary/mgrid_provider/BUILD.bazel
@@ -5,7 +5,9 @@ cc_test(
     name = "mgrid_provider_test",
     srcs = ["mgrid_provider_test.cc"],
     data = [
+        "//vmecpp/test_data:solovev_free_bdy",
         "//vmecpp/test_data:cth_like_free_bdy",
+        "//vmecpp_large_cpp_tests/test_data:solovev_free_bdy",
         "//vmecpp_large_cpp_tests/test_data:cth_like_free_bdy",
     ],
     deps = [
diff --git a/free_boundary/mgrid_provider/mgrid_provider_test.cc b/free_boundary/mgrid_provider/mgrid_provider_test.cc
index df697a3..0303217 100644
--- a/free_boundary/mgrid_provider/mgrid_provider_test.cc
+++ b/free_boundary/mgrid_provider/mgrid_provider_test.cc
@@ -209,9 +209,13 @@ TEST_P(LoadMGridTest, CheckLoadMGrid) {
   }      // index_phi
 }  // CheckLoadMGrid
 
-INSTANTIATE_TEST_SUITE_P(TestVmec, LoadMGridTest,
-                         Values(DataSource{.identifier = "cth_like_free_bdy",
-                                           .tolerance = 1.0e-12,
-                                           .coils_file = "coils.cth_like"}));
+INSTANTIATE_TEST_SUITE_P(
+    TestVmec, LoadMGridTest,
+    Values(DataSource{.identifier = "solovev_free_bdy",
+                      .tolerance = 1.0e-12,
+                      .coils_file = "coils.solovev"},
+           DataSource{.identifier = "cth_like_free_bdy",
+                      .tolerance = 1.0e-12,
+                      .coils_file = "coils.cth_like"}));
 
 }  // namespace vmecpp
diff --git a/free_boundary/surface_geometry/BUILD.bazel b/free_boundary/surface_geometry/BUILD.bazel
index 9796917..5271129 100644
--- a/free_boundary/surface_geometry/BUILD.bazel
+++ b/free_boundary/surface_geometry/BUILD.bazel
@@ -5,7 +5,9 @@ cc_test(
     name = "surface_geometry_test",
     srcs = ["surface_geometry_test.cc"],
     data = [
+        "//vmecpp/test_data:solovev_free_bdy",
         "//vmecpp/test_data:cth_like_free_bdy",
+        "//vmecpp_large_cpp_tests/test_data:solovev_free_bdy",
         "//vmecpp_large_cpp_tests/test_data:cth_like_free_bdy",
     ],
     deps = [
diff --git a/free_boundary/surface_geometry/surface_geometry_test.cc b/free_boundary/surface_geometry/surface_geometry_test.cc
index a2b8064..740741a 100644
--- a/free_boundary/surface_geometry/surface_geometry_test.cc
+++ b/free_boundary/surface_geometry/surface_geometry_test.cc
@@ -185,9 +185,13 @@ TEST_P(SurfaceGeometryTest, CheckSurfaceGeometry) {
   }
 }  // CheckSurfaceGeometry
 
-INSTANTIATE_TEST_SUITE_P(TestSurfaceGeometry, SurfaceGeometryTest,
-                         Values(DataSource{.identifier = "cth_like_free_bdy",
-                                           .tolerance = 1.0e-12,
-                                           .iter2_to_test = {53, 54}}));
+INSTANTIATE_TEST_SUITE_P(
+    TestSurfaceGeometry, SurfaceGeometryTest,
+    Values(DataSource{.identifier = "solovev_free_bdy",
+                      .tolerance = 1.0e-12,
+                      .iter2_to_test = {3}},
+           DataSource{.identifier = "cth_like_free_bdy",
+                      .tolerance = 1.0e-12,
+                      .iter2_to_test = {53, 54}}));
 
 }  // namespace vmecpp