diff --git a/calyx-py/test/correctness/queues/binheap/binheap.data b/calyx-py/test/correctness/queues/binheap/binheap.data
index 49d910a96e..392ed761a9 100644
--- a/calyx-py/test/correctness/queues/binheap/binheap.data
+++ b/calyx-py/test/correctness/queues/binheap/binheap.data
@@ -1,6 +1,127 @@
 {
-  "out": {
+  "commands": {
     "data": [
+      4,
+      2,
+      2,
+      4,
+      0,
+      3,
+      1,
+      0,
+      1,
+      0,
+      2,
+      3,
+      1,
+      3,
+      4,
+      0,
+      4,
+      1,
+      0,
+      1
+    ],
+    "format": {
+      "is_signed": false,
+      "numeric_type": "bitnum",
+      "width": 3
+    }
+  },
+  "values": {
+    "data": [
+      208,
+      143,
+      93,
+      392,
+      199,
+      81,
+      390,
+      36,
+      71,
+      316,
+      316,
+      227,
+      64,
+      67,
+      0,
+      2,
+      107,
+      396,
+      110,
+      84
+    ],
+    "format": {
+      "is_signed": false,
+      "numeric_type": "bitnum",
+      "width": 32
+    }
+  },
+  "ranks": {
+    "data": [
+      85,
+      148,
+      160,
+      101,
+      276,
+      347,
+      320,
+      104,
+      93,
+      353,
+      100,
+      196,
+      152,
+      11,
+      184,
+      212,
+      84,
+      74,
+      135,
+      33
+    ],
+    "format": {
+      "is_signed": false,
+      "numeric_type": "bitnum",
+      "width": 32
+    }
+  },
+  "times": {
+    "data": [
+      21,
+      19,
+      38,
+      37,
+      0,
+      38,
+      43,
+      45,
+      21,
+      4,
+      19,
+      22,
+      19,
+      30,
+      44,
+      20,
+      11,
+      30,
+      30,
+      45
+    ],
+    "format": {
+      "is_signed": false,
+      "numeric_type": "bitnum",
+      "width": 32
+    }
+  },
+  "ans_mem": {
+    "data": [
+      0,
+      0,
+      0,
+      0,
+      0,
       0,
       0,
       0,
diff --git a/calyx-py/test/correctness/queues/binheap/binheap.expect b/calyx-py/test/correctness/queues/binheap/binheap.expect
index a1faa4fc33..aadcae67df 100644
--- a/calyx-py/test/correctness/queues/binheap/binheap.expect
+++ b/calyx-py/test/correctness/queues/binheap/binheap.expect
@@ -1,19 +1,112 @@
 {
-  "out": [
-    3,
-    6,
-    6,
-    8,
-    9,
-    9,
-    10,
-    12,
-    3,
+  "ans_mem": [
+    143,
+    143,
+    316,
+    316,
+    93,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
     0,
     0,
     0,
     0,
     0,
     0
+  ],
+  "commands": [
+    4,
+    2,
+    2,
+    4,
+    0,
+    3,
+    1,
+    0,
+    1,
+    0,
+    2,
+    3,
+    1,
+    3,
+    4,
+    0,
+    4,
+    1,
+    0,
+    1
+  ],
+  "ranks": [
+    85,
+    148,
+    160,
+    101,
+    276,
+    347,
+    320,
+    104,
+    93,
+    353,
+    100,
+    196,
+    152,
+    11,
+    184,
+    212,
+    84,
+    74,
+    135,
+    33
+  ],
+  "values": [
+    208,
+    143,
+    93,
+    392,
+    199,
+    81,
+    390,
+    36,
+    71,
+    316,
+    316,
+    227,
+    64,
+    67,
+    0,
+    2,
+    107,
+    396,
+    110,
+    84
+  ],
+  "times": [
+    21,
+    19,
+    38,
+    37,
+    0,
+    38,
+    43,
+    45,
+    21,
+    4,
+    19,
+    22,
+    19,
+    30,
+    44,
+    20,
+    11,
+    30,
+    30,
+    45
   ]
 }
diff --git a/calyx-py/test/correctness/queues/binheap/binheap_pieo.py b/calyx-py/test/correctness/queues/binheap/binheap_pieo.py
index 82fa7ecd93..88522aeea5 100644
--- a/calyx-py/test/correctness/queues/binheap/binheap_pieo.py
+++ b/calyx-py/test/correctness/queues/binheap/binheap_pieo.py
@@ -91,7 +91,8 @@ def insert_pieo(prog, name, val_queue, time_queue, rank_queue, queue_len, stats=
     decr_num_elements = pieo.decr(num_elements)
     incr_replace_tracker = pieo.incr(replace_tracker)
 
-
+    #Functions for then necessary PIEO functionality
+    
     def push():
         """
             Pushes an element into the PIEO.