diff --git a/test/gpu_kernel_de/conversions.jl b/test/gpu_kernel_de/conversions.jl
index d524a929..f2faebcc 100644
--- a/test/gpu_kernel_de/conversions.jl
+++ b/test/gpu_kernel_de/conversions.jl
@@ -23,25 +23,25 @@ monteprob = EnsembleProblem(prob, prob_func = prob_func, safetycopy = false)
 if ENV["GROUP"] ∉ ("Metal", "oneAPI")
     @test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
         trajectories = 10_000,
-        saveat = 1:10)[1].t == Float32.(1:10)
+        saveat = 1:10).u[1].t == Float32.(1:10)
 
     @test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
         trajectories = 10_000,
-        saveat = 1:0.1:10)[1].t == 1.0f0:0.1f0:10.0f0
+        saveat = 1:0.1:10).u[1].t == 1.0f0:0.1f0:10.0f0
 
     @test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
         trajectories = 10_000,
-        saveat = 1:(1.0f0):10)[1].t == 1:1.0f0:10
+        saveat = 1:(1.0f0):10).u[1].t == 1:1.0f0:10
 
     @test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
         trajectories = 10_000,
-        saveat = 1.0)[1].t == 0.0f0:1.0f0:10.0f0
+        saveat = 1.0).u[1].t == 0.0f0:1.0f0:10.0f0
 end
 
 @test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
     trajectories = 10_000,
-    saveat = [1.0f0, 5.0f0, 10.0f0])[1].t == [1.0f0, 5.0f0, 10.0f0]
+    saveat = [1.0f0, 5.0f0, 10.0f0]).u[1].t == [1.0f0, 5.0f0, 10.0f0]
 
 @test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
     trajectories = 10_000,
-    saveat = [1.0, 5.0, 10.0])[1].t == [1.0f0, 5.0f0, 10.0f0]
+    saveat = [1.0, 5.0, 10.0]).u[1].t == [1.0f0, 5.0f0, 10.0f0]
diff --git a/test/gpu_kernel_de/gpu_ode_continuous_callbacks.jl b/test/gpu_kernel_de/gpu_ode_continuous_callbacks.jl
index 3b949d8b..97c33588 100644
--- a/test/gpu_kernel_de/gpu_ode_continuous_callbacks.jl
+++ b/test/gpu_kernel_de/gpu_ode_continuous_callbacks.jl
@@ -41,7 +41,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
     bench_sol = solve(prob, diffeq_alg,
         adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 2e-3
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
 
     @info "Callback: CallbackSets"
 
@@ -54,7 +54,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
     bench_sol = solve(prob, diffeq_alg,
         adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 2e-3
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
 
     @info "saveat and callbacks"
 
@@ -67,7 +67,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
         adaptive = false, dt = 1.0f0, callback = cb, merge_callbacks = true,
         saveat = [0.0f0, 9.1f0])
 
-    @test norm(bench_sol.u - sol.u[1].u) < 2e-3
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
 
     @info "save_everystep and callbacks"
 
@@ -80,7 +80,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
         adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true,
         save_everystep = false)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 7e-4
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 7e-4
 
     @info "Adaptive version"
 
@@ -94,7 +94,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
         adaptive = true, save_everystep = false, dt = 0.1f0, callback = cb,
         merge_callbacks = true)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 2e-3
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
 
     @info "Callback: CallbackSets"
 
@@ -108,7 +108,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
         adaptive = true, dt = 0.1f0, save_everystep = false, callback = cb,
         merge_callbacks = true)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 2e-3
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
 
     @info "saveat and callbacks"
 
@@ -123,7 +123,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
         tstops = [24.0f0, 40.0f0], saveat = [0.0f0, 9.1f0], reltol = 1.0f-6,
         abstol = 1.0f-6)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 8e-4
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 8e-4
 
     @info "Unadaptive and Adaptive comparison"
 
diff --git a/test/gpu_kernel_de/gpu_sde_regression.jl b/test/gpu_kernel_de/gpu_sde_regression.jl
index 40c9ff19..24490944 100644
--- a/test/gpu_kernel_de/gpu_sde_regression.jl
+++ b/test/gpu_kernel_de/gpu_sde_regression.jl
@@ -12,17 +12,17 @@ for alg in algs
     # dX_t = u*dt + udW_t
     f(u, p, t) = u
     g(u, p, t) = u
-    u0 = @SVector [0.5f0]
+    local u0 = @SVector [0.5f0]
 
-    tspan = (0.0f0, 1.0f0)
-    prob = SDEProblem(f, g, u0, tspan; seed = 123)
+    local tspan = (0.0f0, 1.0f0)
+    local prob = SDEProblem(f, g, u0, tspan; seed = 123)
 
-    monteprob = EnsembleProblem(prob)
+    local monteprob = EnsembleProblem(prob)
 
     dt = Float32(1 // 2^(8))
 
     ## solve using off-loading on CPU
-    sol = solve(monteprob, alg, EnsembleGPUKernel(backend), dt = dt, trajectories = 1000,
+    local sol = solve(monteprob, alg, EnsembleGPUKernel(backend), dt = dt, trajectories = 1000,
         adaptive = false)
 
     sol = solve(monteprob, alg, EnsembleGPUKernel(backend, 0.0), dt = dt,
@@ -50,13 +50,13 @@ for alg in algs
         return SVector{3}(3.0f0, 3.0f0, 3.0f0)
     end
 
-    u0 = @SVector [1.0f0, 0.0f0, 0.0f0]
-    tspan = (0.0f0, 10.0f0)
-    prob = SDEProblem(lorenz, σ_lorenz, u0, tspan)
-    monteprob = EnsembleProblem(prob)
+    local u0 = @SVector [1.0f0, 0.0f0, 0.0f0]
+    local tspan = (0.0f0, 10.0f0)
+    local prob = SDEProblem(lorenz, σ_lorenz, u0, tspan)
+    local monteprob = EnsembleProblem(prob)
     dt = Float32(1 // 2^(8))
 
-    sol = solve(
+    local sol = solve(
         monteprob, alg, EnsembleGPUKernel(backend, 0.0), dt = dt, trajectories = 10,
         adaptive = false)
 
diff --git a/test/gpu_kernel_de/stiff_ode/gpu_ode_continuous_callbacks.jl b/test/gpu_kernel_de/stiff_ode/gpu_ode_continuous_callbacks.jl
index c88ccdcd..c93af194 100644
--- a/test/gpu_kernel_de/stiff_ode/gpu_ode_continuous_callbacks.jl
+++ b/test/gpu_kernel_de/stiff_ode/gpu_ode_continuous_callbacks.jl
@@ -54,7 +54,7 @@ for alg in algs
     bench_sol = solve(prob, Rosenbrock23(),
         adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 8e-4
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 8e-4
 
     @info "Callback: CallbackSets"
 
@@ -67,7 +67,7 @@ for alg in algs
     bench_sol = solve(prob, Rosenbrock23(),
         adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 8e-4
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 8e-4
 
     @info "saveat and callbacks"
 
@@ -80,7 +80,7 @@ for alg in algs
         adaptive = false, dt = 1.0f0, callback = cb, merge_callbacks = true,
         saveat = [0.0f0, 9.1f0])
 
-    @test norm(bench_sol.u - sol.u[1].u) < 5e-4
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 5e-4
 
     @info "save_everystep and callbacks"
 
@@ -93,7 +93,7 @@ for alg in algs
         adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true,
         save_everystep = false)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 6e-4
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 6e-4
 
     @info "Adaptive version"
 
@@ -107,7 +107,7 @@ for alg in algs
         adaptive = true, save_everystep = false, dt = 0.1f0, callback = cb,
         merge_callbacks = true)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 2e-3
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
 
     @info "Callback: CallbackSets"
 
@@ -121,7 +121,7 @@ for alg in algs
         adaptive = true, dt = 0.1f0, save_everystep = false, callback = cb,
         merge_callbacks = true)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 2e-3
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
 
     @info "saveat and callbacks"
 
@@ -136,7 +136,7 @@ for alg in algs
         tstops = [24.0f0, 40.0f0], saveat = [0.0f0, 9.1f0], reltol = 1.0f-6,
         abstol = 1.0f-6)
 
-    @test norm(bench_sol.u - sol.u[1].u) < 6e-4
+    @test norm(bench_sol.u[end] - sol.u[1].u[end]) < 6e-4
 
     @info "Unadaptive and Adaptive comparison"