diff --git a/src/mmu/pmachecker.sv b/src/mmu/pmachecker.sv
index cd47eadfe..7aa20fc2f 100644
--- a/src/mmu/pmachecker.sv
+++ b/src/mmu/pmachecker.sv
@@ -62,13 +62,13 @@ module pmachecker import cvw::*;  #(parameter cvw_t P) (
 
   // Nonidemdempotent means access could have side effect and must not be done speculatively or redundantly
   // I/O is nonidempotent.  PBMT can override PMA; NC is idempotent and IO is non-idempotent
-  assign IdempotentRegion = SelRegions[11] | SelRegions[10] | SelRegions[9] | SelRegions[8] | SelRegions[7]; 
-  assign Idempotent = (PBMemoryType == 2'b00) ? IdempotentRegion : (PBMemoryType == 2'b01);  // exclusion-tag: unused-idempotent
+  assign IdempotentRegion = SelRegions[11] | SelRegions[10] | SelRegions[9] | SelRegions[8] | SelRegions[7]; // exclusion-tag: unused-idempotent
+  assign Idempotent = (PBMemoryType == 2'b00) ? IdempotentRegion : (PBMemoryType == 2'b01);  
  
   // Atomic operations are only allowed on RAM
-  assign AtomicAllowed = SelRegions[11] | SelRegions[9] | SelRegions[7];
+  assign AtomicAllowed = SelRegions[11] | SelRegions[9] | SelRegions[7]; // exclusion-tag: unused-idempotent
   // Check if tightly integrated memories are selected
-  assign SelTIM = SelRegions[11] | SelRegions[10];
+  assign SelTIM = SelRegions[11] | SelRegions[10]; // exclusion-tag: unused-idempotent
 
   // Detect access faults
   assign PMAAccessFault          = (SelRegions[0]) & AccessRWX | AtomicAccessM & ~AtomicAllowed;  
diff --git a/testbench/testbench.sv b/testbench/testbench.sv
index 56a8db268..42014cbdb 100644
--- a/testbench/testbench.sv
+++ b/testbench/testbench.sv
@@ -159,7 +159,7 @@ module testbench;
     end
     if (tests.size() == 0) begin
       $display("TEST %s not supported in this configuration", TEST);
-      //$stop;
+      $stop;
     end
   end // initial begin
 
@@ -511,7 +511,7 @@ module testbench;
         errors = errors+1;
         $display("  Error on test %s result %d: adr = %h sim (D$) %h sim (DTIM_SUPPORTED) = %h, signature = %h", 
 			     TestName, i, (testadr+i)*(P.XLEN/8), testbench.DCacheFlushFSM.ShadowRAM[testadr+i], sig, signature[i]);
-        //$stop; //***debug
+        $stop; //***debug
       end
       i = i + 1;
     end
diff --git a/testbench/tests.vh b/testbench/tests.vh
index f1cc6db39..0a1607a16 100644
--- a/testbench/tests.vh
+++ b/testbench/tests.vh
@@ -2004,12 +2004,12 @@ string arch64zbs[] = '{
 
  string wally64periph[] = '{
     `WALLYTEST,
-    //"rv64i_m/privilege/src/WALLY-periph-01.S",
-    //"rv64i_m/privilege/src/WALLY-clint-01.S",
-    //"rv64i_m/privilege/src/WALLY-gpio-01.S",
-    //"rv64i_m/privilege/src/WALLY-plic-01.S",
-    //"rv64i_m/privilege/src/WALLY-plic-s-01.S",
-    //"rv64i_m/privilege/src/WALLY-uart-01.S",
+    "rv64i_m/privilege/src/WALLY-periph-01.S",
+    "rv64i_m/privilege/src/WALLY-clint-01.S",
+    "rv64i_m/privilege/src/WALLY-gpio-01.S",
+    "rv64i_m/privilege/src/WALLY-plic-01.S",
+    "rv64i_m/privilege/src/WALLY-plic-s-01.S",
+    "rv64i_m/privilege/src/WALLY-uart-01.S",
     "rv64i_m/privilege/src/WALLY-spi-01.S"
  };