diff --git a/test/unit_tests/fifo-decoder-neurons-encoder-fifo/test.act b/test/unit_tests/fifo-decoder-neurons-encoder-fifo/test.act
index 2bb1733..9f58e69 100644
--- a/test/unit_tests/fifo-decoder-neurons-encoder-fifo/test.act
+++ b/test/unit_tests/fifo-decoder-neurons-encoder-fifo/test.act
@@ -57,15 +57,17 @@ defproc fifo_decoder_neurons_encoder_fifo (avMx1of2<7> in; avMx1of2<7> out; bool
     and_grid<Nx, Ny> _and_grid(.inx = decoder.outx, .iny = decoder.outy, .supply = supply);
     // Pretend that each "synapse" immediately makes its one neuron "spike".
     // that is, connect the output of each encoder target to the decoder input.
-    nrn_hs_2D_array<Nx,Ny,10> neuron_grid(.reset_B = _reset_B, .supply = supply);
+    nrn_hs_2d_array<Nx,Ny> neuron_grid(.reset_B = _reset_B, .supply = supply);
     (i:Nx*Ny:
         // Connect the output bool to the input req of each neuron handshaker
         // Leave ack dangling.
         neuron_grid.in[i].r = _and_grid.out[i];
     )
 
-    encoder2D<NxC,NyC,Nx,Ny,4> encoder(.inx = neuron_grid.outx, .iny = neuron_grid.outy,
+    encoder2d_simple<NxC,NyC,Nx,Ny,4> encoder(.inx = neuron_grid.outx, .iny = neuron_grid.outy,
+        .to_pd_x = neuron_grid.to_pd_x, .to_pd_y = neuron_grid.to_pd_y,
         .reset_B = _reset_B, .supply = supply);
+
     fifo<NxC + NyC,5> fifo_post(.in = encoder.out, .out = out, .reset_B = _reset_B, .supply = supply);
 
 }
diff --git a/test/unit_tests/fifo-decoder-neurons-encoder-fifo/test.prsim b/test/unit_tests/fifo-decoder-neurons-encoder-fifo/test.prsim
index 1c79006..9047498 100644
--- a/test/unit_tests/fifo-decoder-neurons-encoder-fifo/test.prsim
+++ b/test/unit_tests/fifo-decoder-neurons-encoder-fifo/test.prsim
@@ -14,9 +14,29 @@ set e.dly_cfg[5] 1
 
 cycle
 
+# assert e.decoder.outx[0] 0
+# assert e.neuron_grid.outx[0].r 0
+
+
+# assert e.encoder.pd_x[0].inv.y 1
+
+# assert e.encoder.pd_x[0].pull_downR.n1 1
+# assert e.encoder.pd_x[0].pull_downR.n2 1
+# assert e.encoder.pd_x[0].pull_downR.y 0
+
+# assert e.neuron_grid.neurons[0].pu_x.p1 1
+# assert e.neuron_grid.neurons[0].pu_x.p2 1
+# assert e.neuron_grid.neurons[0].pu_x.p3 1
+
+# assert e.encoder.Xarb.in[0].a 0
+
+
 
 mode run
 system "echo '[] Set reset 0'"
+system "echo '[] Asserting decoder req 0 0'"
+
+
 status X
 set Reset 0
 cycle