diff --git a/test/MatrixFields/matrix_field_test_utils.jl b/test/MatrixFields/matrix_field_test_utils.jl
index a55f55f625..3512133d52 100644
--- a/test/MatrixFields/matrix_field_test_utils.jl
+++ b/test/MatrixFields/matrix_field_test_utils.jl
@@ -216,7 +216,7 @@ function test_spaces(::Type{FT}) where {FT}
     hypsography =
         using_cuda ? Hypsography.Flat() :
         Hypsography.LinearAdaption(
-            @. cosd(sfc_coord.lat) + cosd(sfc_coord.long) + 1
+            Geometry.ZPoint.(@. cosd(sfc_coord.lat) + cosd(sfc_coord.long) + 1),
         ) # TODO: FD operators don't currently work with hypsography on GPUs.
     center_space =
         Spaces.ExtrudedFiniteDifferenceSpace(hspace, vspace, hypsography)
diff --git a/test/Operators/finitedifference/column.jl b/test/Operators/finitedifference/column.jl
index 1adf0632f7..325a294455 100644
--- a/test/Operators/finitedifference/column.jl
+++ b/test/Operators/finitedifference/column.jl
@@ -125,6 +125,7 @@ end
 end
 
 @testset "Test composed stencils" begin
+    are_boundschecks_forced = Base.JLOptions().check_bounds == 1
     for FT in (Float32, Float64)
         domain = Domains.IntervalDomain(
             Geometry.ZPoint{FT}(0.0),
@@ -158,7 +159,11 @@ end
             right = Operators.SetGradient(FT(-1)),
         )
 
-        @test_throws Exception ∂.(w .* I.(θ))
+        if are_boundschecks_forced
+            @test_throws Exception ∂.(w .* I.(θ))
+        else
+            @warn "Bounds check on BoundsError ∂.(w .* I.(θ)) not verified."
+        end
 
         # 2) we set boundaries on the 1st operator
         I = Operators.InterpolateC2F(
@@ -201,7 +206,6 @@ end
         ∂ = Operators.GradientF2C()
 
         # TODO: should we throw something else?
-        are_boundschecks_forced = Base.JLOptions().check_bounds == 1
         if are_boundschecks_forced
             @test_throws BoundsError ∂.(w .* I.(θ))
         else
diff --git a/test/Spaces/spaces.jl b/test/Spaces/spaces.jl
index 482aa0dc3b..c09da20faa 100644
--- a/test/Spaces/spaces.jl
+++ b/test/Spaces/spaces.jl
@@ -208,7 +208,7 @@ end
     @test coord_slab[1, 4] ≈ Geometry.XYPoint{FT}(-3.0, 8.0)
     @test coord_slab[4, 4] ≈ Geometry.XYPoint{FT}(5.0, 8.0)
 
-    local_geometry_slab = slab(Spaces.local_geometry(space), 1)
+    local_geometry_slab = slab(Spaces.local_geometry_data(space), 1)
     dss_weights_slab = slab(Spaces.local_dss_weights(space), 1)
 
     if on_gpu