diff --git a/lbmpy_tests/test_fluctuating_lb.py b/lbmpy_tests/test_fluctuating_lb.py
index dd3ef9c568caea7733ec246f439b8e09bc5da174..31fef9df0741de4ce8fde4a84af140feb58c6cfb 100644
--- a/lbmpy_tests/test_fluctuating_lb.py
+++ b/lbmpy_tests/test_fluctuating_lb.py
@@ -80,10 +80,10 @@ def get_fluctuating_lb(size=None, kT=None, omega_shear=None, omega_bulk=None, om
 
     # Method setup
     method = create_mrt_orthogonal(
-        stencil=get_stencil('D3Q19'),
+        stencil=LBStencil(Stencil.D3Q19),
         compressible=True,
         weighted=True,
-        relaxation_rate_getter=rr_getter,
+        relaxation_rates=rr_getter,
         force_model=Guo(force=force_field.center_vector))
     collision_rule = create_lb_collision_rule(
         method,
@@ -103,13 +103,11 @@ def get_fluctuating_lb(size=None, kT=None, omega_shear=None, omega_bulk=None, om
     stream = create_stream_pull_with_output_kernel(collision.method, src, dst,
                                                    {'density': rho, 'velocity': u})
 
-    opts = {'cpu_openmp': True,
-            'cpu_vectorize_info': None,
-            'target': dh.default_target}
+    config = CreateKernelConfig(cpu_openmp=True, target=dh.default_target)
 
     # Compile kernels
-    stream_kernel = ps.create_kernel(stream, **opts).compile()
-    collision_kernel = ps.create_kernel(collision, **opts).compile()
+    stream_kernel = ps.create_kernel(stream, config=config).compile()
+    collision_kernel = ps.create_kernel(collision, config=config).compile()
 
     sync_pdfs = dh.synchronization_function([src.name])
 
diff --git a/lbmpy_tests/test_momentbased_equivalences.py b/lbmpy_tests/test_momentbased_equivalences.py
index 9b63e3d227f7979b96ff0551df6bc9afd88019f0..4e41e65f0dc99c869329cb9e59ed0ff499fec282 100644
--- a/lbmpy_tests/test_momentbased_equivalences.py
+++ b/lbmpy_tests/test_momentbased_equivalences.py
@@ -1,6 +1,5 @@
 import pytest
 import sympy as sp
-from sympy.polys.polytools import monic
 
 from lbmpy.creationfunctions import create_lb_method, create_lb_collision_rule
 from lbmpy.moments import (
@@ -8,7 +7,7 @@ from lbmpy.moments import (
     exponent_tuple_sort_key)
 from lbmpy.stencils import get_stencil
 
-from lbmpy.methods.creationfunctions import mrt_orthogonal_modes_literature
+from lbmpy.methods.default_moment_sets import mrt_orthogonal_modes_literature
 
 from lbmpy.moment_transforms import (
     PdfsToMomentsByMatrixTransform, PdfsToMomentsByChimeraTransform
@@ -34,8 +33,10 @@ def test_moment_transform_equivalences(stencil, monomials):
     else:
         moment_exponents = None
 
-    matrix_transform = PdfsToMomentsByMatrixTransform(stencil, moment_polynomials, rho, u, moment_exponents=moment_exponents)
-    chimera_transform = PdfsToMomentsByChimeraTransform(stencil, moment_polynomials, rho, u, moment_exponents=moment_exponents)
+    matrix_transform = PdfsToMomentsByMatrixTransform(stencil, moment_polynomials, rho, u,
+                                                      moment_exponents=moment_exponents)
+    chimera_transform = PdfsToMomentsByChimeraTransform(stencil, moment_polynomials, rho, u,
+                                                        moment_exponents=moment_exponents)
 
     f_to_m_matrix = matrix_transform.forward_transform(pdfs, return_monomials=monomials)
     f_to_m_matrix = f_to_m_matrix.new_without_subexpressions().main_assignments_dict
@@ -69,8 +70,8 @@ d3q15_literature = mrt_orthogonal_modes_literature(get_stencil('D3Q15'), True)
 d3q19_literature = mrt_orthogonal_modes_literature(get_stencil('D3Q19'), True)
 
 setups = [
-    ('D2Q9', 'srt', None, 'Guo'), 
-    ('D2Q9', 'mrt', None, 'Simple'), 
+    ('D2Q9', 'srt', None, 'Guo'),
+    ('D2Q9', 'mrt', None, 'Simple'),
     ('D3Q15', 'mrt', None, 'Simple'),
     ('D3Q15', 'mrt', d3q15_literature, 'Simple'),
     ('D3Q19', 'trt', None, 'Simple'),
@@ -78,6 +79,7 @@ setups = [
     ('D3Q27', 'srt', None, 'Guo')
 ]
 
+
 @pytest.mark.parametrize('setup', setups)
 def test_population_and_moment_space_equivalence(setup):
     stencil = get_stencil(setup[0])
@@ -88,14 +90,16 @@ def test_population_and_moment_space_equivalence(setup):
     fmodel = setup[3]
     force = sp.symbols(f'F_:{d}')
 
+    conserved_moments = 1 + d
+
     params = {
         'stencil': stencil,
         'method': method,
-        'relaxation_rates': sp.symbols(f'omega_:{q}'),
-        'nested_moments' : nested_moments,
+        'relaxation_rates': [*[0] * conserved_moments, *sp.symbols(f'omega_:{q - conserved_moments}')],
+        'nested_moments': nested_moments,
         'force_model': fmodel,
         'force': force,
-        'weighted' : True,
+        'weighted': True,
         'compressible': True
     }
 
@@ -120,6 +124,6 @@ def test_population_and_moment_space_equivalence(setup):
     cr_pdf_space = create_lb_collision_rule(lb_method=lb_method_pdf_space, optimization=optimization)
     cr_pdf_space = cr_pdf_space.new_without_subexpressions(subexpressions_to_keep=keep)
 
-    for a,b in zip(cr_moment_space.main_assignments, cr_pdf_space.main_assignments):
+    for a, b in zip(cr_moment_space.main_assignments, cr_pdf_space.main_assignments):
         diff = (a.rhs - b.rhs).expand()
         assert diff == 0, f"Mismatch between population- and moment-space equations in PDFs {a.lhs}, {b.lhs}"
diff --git a/lbmpy_tests/test_serial_scenarios.py b/lbmpy_tests/test_serial_scenarios.py
index 800da802966ce3e74ff3beaed993bd615f04d648..17e9278888c9df4be61c303c99a0313402397f70 100644
--- a/lbmpy_tests/test_serial_scenarios.py
+++ b/lbmpy_tests/test_serial_scenarios.py
@@ -219,6 +219,6 @@ def test_ldc_mrt(action='Testing', plot="off"):
         moments = mrt_orthogonal_modes_literature(get_stencil("D3Q19"), True)
         compare_lid_driven_cavity(domain_size=(16, 17, 18), lid_velocity=0.005, stencil='D3Q19',
                                   method='MRT', nested_moments=moments, compressible=False, maxwellian_moments=False,
-                                  relaxation_rates=[1.3, 1.4, 1.5, 1.25, 1.36, 1.12], action=action, plot=plot)
+                                  relaxation_rates=[1.25, 1.3, 1.4, 1.5, 1.36, 1.12], action=action, plot=plot)
     else:
         print("Possible Actions: Regenerate or Testing")