--- a/test/SbpOperators/boundaryops/normal_derivative_test.jl	Mon Feb 21 10:33:58 2022 +0100
+++ b/test/SbpOperators/boundaryops/normal_derivative_test.jl	Fri Feb 03 22:14:47 2023 +0100
@@ -2,9 +2,8 @@
 
 using Sbplib.SbpOperators
 using Sbplib.Grids
+using Sbplib.LazyTensors
 using Sbplib.RegionIndices
-using Sbplib.LazyTensors
-
 import Sbplib.SbpOperators.BoundaryOperator
 
 @testset "normal_derivative" begin
@@ -14,22 +13,23 @@
     	stencil_set = read_stencil_set(sbp_operators_path()*"standard_diagonal.toml"; order=4)
     	d_closure = parse_stencil(stencil_set["d1"]["closure"])
         @testset "1D" begin
-            d_l = normal_derivative(g_1D, d_closure, Lower())
-            @test d_l == normal_derivative(g_1D, d_closure, CartesianBoundary{1,Lower}())
+            d_l = normal_derivative(g_1D, d_closure, CartesianBoundary{1,Lower}())
+            @test d_l == normal_derivative(g_1D, stencil_set, CartesianBoundary{1,Lower}())
             @test d_l isa BoundaryOperator{T,Lower} where T
-            @test d_l isa TensorMapping{T,0,1} where T
+            @test d_l isa LazyTensor{T,0,1} where T
         end
         @testset "2D" begin
             d_w = normal_derivative(g_2D, d_closure, CartesianBoundary{1,Lower}())
             d_n = normal_derivative(g_2D, d_closure, CartesianBoundary{2,Upper}())
-            Ix = IdentityMapping{Float64}((size(g_2D)[1],))
-            Iy = IdentityMapping{Float64}((size(g_2D)[2],))
-            d_l = normal_derivative(restrict(g_2D,1),d_closure,Lower())
-            d_r = normal_derivative(restrict(g_2D,2),d_closure,Upper())
+            Ix = IdentityTensor{Float64}((size(g_2D)[1],))
+            Iy = IdentityTensor{Float64}((size(g_2D)[2],))
+            d_l = normal_derivative(restrict(g_2D,1),d_closure,CartesianBoundary{1,Lower}())
+            d_r = normal_derivative(restrict(g_2D,2),d_closure,CartesianBoundary{1,Upper}())
+            @test d_w == normal_derivative(g_2D, stencil_set, CartesianBoundary{1,Lower}())
             @test d_w ==  d_l⊗Iy
             @test d_n ==  Ix⊗d_r
-            @test d_w isa TensorMapping{T,1,2} where T
-            @test d_n isa TensorMapping{T,1,2} where T
+            @test d_w isa LazyTensor{T,1,2} where T
+            @test d_n isa LazyTensor{T,1,2} where T
         end
     end
     @testset "Accuracy" begin
@@ -40,29 +40,23 @@
         @testset "2nd order" begin
         	stencil_set = read_stencil_set(sbp_operators_path()*"standard_diagonal.toml"; order=2)
         	d_closure = parse_stencil(stencil_set["d1"]["closure"])
-            d_w = normal_derivative(g_2D, d_closure, CartesianBoundary{1,Lower}())
-            d_e = normal_derivative(g_2D, d_closure, CartesianBoundary{1,Upper}())
-            d_s = normal_derivative(g_2D, d_closure, CartesianBoundary{2,Lower}())
-            d_n = normal_derivative(g_2D, d_closure, CartesianBoundary{2,Upper}())
+            d_w, d_e, d_s, d_n = normal_derivative.(Ref(g_2D), Ref(d_closure), boundary_identifiers(g_2D))
 
-            @test d_w*v ≈ v∂x[1,:] atol = 1e-13
-            @test d_e*v ≈ -v∂x[end,:] atol = 1e-13
-            @test d_s*v ≈ v∂y[:,1] atol = 1e-13
-            @test d_n*v ≈ -v∂y[:,end] atol = 1e-13
+            @test d_w*v ≈ -v∂x[1,:] atol = 1e-13
+            @test d_e*v ≈ v∂x[end,:] atol = 1e-13
+            @test d_s*v ≈ -v∂y[:,1] atol = 1e-13
+            @test d_n*v ≈ v∂y[:,end] atol = 1e-13
         end
 
         @testset "4th order" begin
-            stencil_set = read_stencil_set(sbp_operators_path()*"standard_diagonal.toml"; order=2)
+            stencil_set = read_stencil_set(sbp_operators_path()*"standard_diagonal.toml"; order=4)
         	d_closure = parse_stencil(stencil_set["d1"]["closure"])
-            d_w = normal_derivative(g_2D, d_closure, CartesianBoundary{1,Lower}())
-            d_e = normal_derivative(g_2D, d_closure, CartesianBoundary{1,Upper}())
-            d_s = normal_derivative(g_2D, d_closure, CartesianBoundary{2,Lower}())
-            d_n = normal_derivative(g_2D, d_closure, CartesianBoundary{2,Upper}())
-
-            @test d_w*v ≈ v∂x[1,:] atol = 1e-13
-            @test d_e*v ≈ -v∂x[end,:] atol = 1e-13
-            @test d_s*v ≈ v∂y[:,1] atol = 1e-13
-            @test d_n*v ≈ -v∂y[:,end] atol = 1e-13
+            d_w, d_e, d_s, d_n = normal_derivative.(Ref(g_2D), Ref(d_closure), boundary_identifiers(g_2D))
+            
+            @test d_w*v ≈ -v∂x[1,:] atol = 1e-13
+            @test d_e*v ≈ v∂x[end,:] atol = 1e-13
+            @test d_s*v ≈ -v∂y[:,1] atol = 1e-13
+            @test d_n*v ≈ v∂y[:,end] atol = 1e-13
         end
     end
 end