diff --git a/MEMO b/MEMO
index 3087e53bb52a19123c4175a691244962fd394704..15d4ae95b84e177a93bfed0576158b9c832a8364 100644
--- a/MEMO
+++ b/MEMO
@@ -46,8 +46,6 @@ To-do
 
 - Fix timer / call code
 
-- Fuse: store/fetch elimination?
-
 Fixes:
 
 - Group instructions by dependency/inames for scheduling, to
diff --git a/proto-tests/test_dg.py b/test/test_dg.py
similarity index 92%
rename from proto-tests/test_dg.py
rename to test/test_dg.py
index 0490a3b07ab03ca696e6c921a2a20ca22eca40d7..a405d13e7b7760b45546bec1557ef971bf16ebb8 100644
--- a/proto-tests/test_dg.py
+++ b/test/test_dg.py
@@ -78,7 +78,6 @@ def test_dg_volume(ctx_factory):
     def variant_prefetch_fields(knl):
         knl = lp.tag_inames(knl, dict(n="l.0"))
         knl = lp.split_iname(knl, "k", 3, outer_tag="g.0", inner_tag="l.1")
-        # FIXME generates too many ifs
         for name in ["u", "v", "w", "p"]:
             knl = lp.add_prefetch(knl, "%s[k,:]" % name, ["k_inner"])
 
@@ -102,7 +101,7 @@ def test_dg_volume(ctx_factory):
                 for prefix in ["", "rhs"]]
 
         for name in arg_names:
-            knl = lp.add_padding(knl, name, axis=1, align_bytes=32)
+            knl = lp.add_padding(knl, name, axis=0, align_bytes=32)
 
         knl = lp.tag_inames(knl, dict(m="unr"))
 
@@ -118,30 +117,32 @@ def test_dg_volume(ctx_factory):
                 for name in ["u", "v", "w", "p"]
                 for prefix in ["", "rhs"]]
 
-        knl = lp.split_arg_axis(knl, [(nm, 1) for nm in arg_names], pad_mult)
+        knl = lp.split_arg_axis(knl, [(nm, 0) for nm in arg_names], pad_mult)
 
         return knl
 
     parameters_dict = dict(K=K)
 
     for variant in [
-            #variant_basic,
-            #variant_more_per_work_group,
-            #variant_image_d,
-            #variant_prefetch_d,
+            variant_basic,
+            variant_more_per_work_group,
+            variant_image_d,
+            variant_prefetch_d,
             variant_prefetch_fields,
-            #variant_k_ilp,
-            #variant_simple_padding,
-            #variant_fancy_padding
+            variant_k_ilp,
+            variant_simple_padding,
+            variant_fancy_padding
             ]:
         kernel_gen = lp.generate_loop_schedules(variant(knl))
         kernel_gen = lp.check_kernels(kernel_gen, parameters_dict)
 
         lp.auto_test_vs_ref(seq_knl, ctx, kernel_gen, parameters=parameters_dict,
-                codegen_kwargs=dict(with_annotation=True))
+                #codegen_kwargs=dict(with_annotation=True)
+                )
 
 
-def test_dg_surface(ctx_factory):
+def no_test_dg_surface(ctx_factory):
+    # tough to test, would need the right index info
     dtype = np.float32
     ctx = ctx_factory()