diff --git a/wally-pipelined/src/privileged/csrm.sv b/wally-pipelined/src/privileged/csrm.sv
index 134bb0684..473dbaf63 100644
--- a/wally-pipelined/src/privileged/csrm.sv
+++ b/wally-pipelined/src/privileged/csrm.sv
@@ -137,7 +137,7 @@ module csrm #(parameter
     else
       flopenl #(32)   MCOUNTERENreg(clk, reset, WriteMCOUNTERENM, CSRWriteValM[31:0], 32'hFFFFFFFF, MCOUNTEREN_REGW);
   endgenerate
-  flopenl #(32)   MCOUNTINHIBITreg(clk, reset, WriteMCOUNTINHIBITM, CSRWriteValM[31:0], 32'hFFFFFFFF, MCOUNTINHIBIT_REGW);
+  flopenl #(32)   MCOUNTINHIBITreg(clk, reset, WriteMCOUNTINHIBITM, CSRWriteValM[31:0], 32'h0, MCOUNTINHIBIT_REGW);
 
   // There are PMP_ENTRIES = 0, 16, or 64 PMPADDR registers, each of which has its own flop
 
diff --git a/wally-pipelined/testbench/testbench-imperas.sv b/wally-pipelined/testbench/testbench-imperas.sv
index 33bafaf56..a4daf7f31 100644
--- a/wally-pipelined/testbench/testbench-imperas.sv
+++ b/wally-pipelined/testbench/testbench-imperas.sv
@@ -44,14 +44,14 @@ module testbench();
   logic [31:0] InstrW;
   logic [`XLEN-1:0] meminit;
 
-  string tests32mmu[] = '{
+  //string tests32mmu[] = '{
     //"rv32mmu/WALLY-MMU-SV32", "3000"
-    };
+  //  };
 
-  string tests64mmu[] = '{
+  //string tests64mmu[] = '{
     //"rv64mmu/WALLY-MMU-SV48", "3000",
     //"rv64mmu/WALLY-MMU-SV39", "3000"
-  };
+  //};
 
   
 string tests32f[] = '{
@@ -540,7 +540,7 @@ string tests32f[] = '{
         else              tests = {tests, tests64iNOc};
         if (`M_SUPPORTED) tests = {tests, tests64m};
         if (`A_SUPPORTED) tests = {tests, tests64a};
-        if (`MEM_VIRTMEM) tests = {tests, tests64mmu};
+        //if (`MEM_VIRTMEM) tests = {tests, tests64mmu};
         if (`F_SUPPORTED) tests = {tests64f, tests};
         if (`D_SUPPORTED) tests = {tests64d, tests};
       end
@@ -558,7 +558,7 @@ string tests32f[] = '{
           if (`M_SUPPORTED % 2 == 1) tests = {tests, tests32m};
           if (`F_SUPPORTED) tests = {tests32f, tests};
           if (`A_SUPPORTED) tests = {tests, tests32a};
-          if (`MEM_VIRTMEM) tests = {tests, tests32mmu};
+          //if (`MEM_VIRTMEM) tests = {tests, tests32mmu};
       end
     end
   end