diff --git a/benchmark.py b/benchmark.py
index 266d998001a417e1c1c1d88c1bfc35974724a4ed..00034a7648dc8d7e31ecf85ad36040db2ba02ed5 100644
--- a/benchmark.py
+++ b/benchmark.py
@@ -14,14 +14,18 @@ from pyopencl.tools import (  # noqa
         pytest_generate_tests_for_pyopencl
         as pytest_generate_tests)
 
-import fixtures
+import device_fixtures as device
+import program_fixtures as program
+import transform_fixtures as transform
+import setup_fixtures as setup
 
 def benchmark_compute_flux_derivatives_gpu(ctx_factory):
     logging.basicConfig(level="INFO")
 
-    prg = fixtures.get_gpu_transformed_weno()
+    prg = program.get_weno()
+    prg = transform.weno_for_gpu(prg)
 
-    queue = fixtures.get_queue(ctx_factory)
+    queue = device.get_queue(ctx_factory)
 
     ndim = 3
     nvars = 5
@@ -31,10 +35,10 @@ def benchmark_compute_flux_derivatives_gpu(ctx_factory):
     nz = n
 
     print("ARRAY GEN")
-    states = fixtures.f_array(queue, nvars, nx+6, ny+6, nz+6)
-    fluxes = fixtures.f_array(queue, nvars, ndim, nx+6, ny+6, nz+6)
-    metrics = fixtures.f_array(queue, ndim, ndim, nx+6, ny+6, nz+6)
-    metric_jacobians = fixtures.f_array(queue, nx+6, ny+6, nz+6)
+    states = setup.random_array_on_device(queue, nvars, nx+6, ny+6, nz+6)
+    fluxes = setup.random_array_on_device(queue, nvars, ndim, nx+6, ny+6, nz+6)
+    metrics = setup.random_array_on_device(queue, ndim, ndim, nx+6, ny+6, nz+6)
+    metric_jacobians = setup.random_array_on_device(queue, nx+6, ny+6, nz+6)
     print("END ARRAY GEN")
 
     flux_derivatives_dev = cl.array.empty(queue, (nvars, ndim, nx+6, ny+6,