diff --git a/wally-pipelined/regression/wally-peripherals.do b/wally-pipelined/regression/wally-peripherals.do
deleted file mode 100644
index 83ad02d0..00000000
--- a/wally-pipelined/regression/wally-peripherals.do
+++ /dev/null
@@ -1,43 +0,0 @@
-# wally-peripherals.do 
-#
-# Created by Ben Bracker (bbracker@hmc.edu) on 11 Feb. 2021
-#
-# Based on wally-pipelined.do by 
-# James Stine, 2008; David Harris 2021
-# Go Cowboys!!!!!!
-
-# Use this wally-pipelined.do file to run this example.
-# Either bring up ModelSim and type the following at the "ModelSim>" prompt:
-#     do wally-pipelined.do
-# or, to run from a shell, type the following at the shell prompt:
-#     vsim -do wally-pipelined.do -c
-# (omit the "-c" to see the GUI while running from the shell)
-
-onbreak {resume}
-
-# create library
-if [file exists work] {
-    vdel -all
-}
-vlib work
-
-# compile source files
-# suppress spurious warnngs about 
-# "Extra checking for conflicts with always_comb done at vopt time"
-# because vsim will run vopt
-
-# default to config/rv64ic, but allow this to be overridden at the command line.  For example:
-# do wally-pipelined.do ../config/rv32ic
-# That said, I don't think there are any peripherals that use anything but rv64i just yet.
-switch $argc {
-    0 {vlog +incdir+../config/rv64ic ../testbench/testbench-peripherals.sv ../src/*/*.sv -suppress 2583}
-    1 {vlog +incdir+$1 ../testbench/testbench-peripherals.sv ../src/*/*.sv -suppress 2583}
-}
-# start and run simulation
-# remove +acc flag for faster sim during regressions if there is no need to access internal signals
-vopt +acc work.testbench -o workopt 
-vsim workopt
-
-
-view wave
-do wave-dos/peripheral-waves.do
diff --git a/wally-pipelined/regression/wally-pipelined.do b/wally-pipelined/regression/wally-pipelined.do
index a5041005..7f08e56b 100644
--- a/wally-pipelined/regression/wally-pipelined.do
+++ b/wally-pipelined/regression/wally-pipelined.do
@@ -38,17 +38,15 @@ switch $argc {
 vopt +acc work.testbench -o workopt 
 vsim workopt
 
-
 view wave
-
 -- display input and output signals as hexidecimal values
-do ./wave-dos/ahb-waves.do
+do ./wave-dos/peripheral-waves.do
 
 -- Set Wave Output Items 
 TreeUpdate [SetDefaultTree]
 WaveRestoreZoom {0 ps} {100 ps}
 configure wave -namecolwidth 250
-configure wave -valuecolwidth 140
+configure wave -valuecolwidth 120
 configure wave -justifyvalue left
 configure wave -signalnamewidth 0
 configure wave -snapdistance 10
@@ -58,6 +56,8 @@ configure wave -childrowmargin 2
 set DefaultRadix hexadecimal
 
 -- Run the Simulation 
-#run 4100
+#run 5000 
 run -all
 #quit
+noview ../testbench/testbench-imperas.sv
+view wave
diff --git a/wally-pipelined/regression/wave-dos/peripheral-waves.do b/wally-pipelined/regression/wave-dos/peripheral-waves.do
index c156be93..b635292d 100644
--- a/wally-pipelined/regression/wave-dos/peripheral-waves.do
+++ b/wally-pipelined/regression/wave-dos/peripheral-waves.do
@@ -71,22 +71,3 @@ add wave -divider
 # everything else
 add wave -hex -r /testbench/*
 
--- Set Wave Output Items 
-TreeUpdate [SetDefaultTree]
-WaveRestoreZoom {0 ps} {100 ps}
-configure wave -namecolwidth 250
-configure wave -valuecolwidth 120
-configure wave -justifyvalue left
-configure wave -signalnamewidth 0
-configure wave -snapdistance 10
-configure wave -datasetprefix 0
-configure wave -rowmargin 4
-configure wave -childrowmargin 2
-set DefaultRadix hexadecimal
-
--- Run the Simulation 
-#run 5000 
-run -all
-#quit
-noview ../testbench/testbench-peripherals.sv
-view wave
\ No newline at end of file
diff --git a/wally-pipelined/testbench/testbench-imperas.sv b/wally-pipelined/testbench/testbench-imperas.sv
index 0cc7845a..4c9b46ad 100644
--- a/wally-pipelined/testbench/testbench-imperas.sv
+++ b/wally-pipelined/testbench/testbench-imperas.sv
@@ -29,6 +29,7 @@
 module testbench();
   parameter DEBUG = 0;
   parameter TESTSBP = 0;
+  parameter TESTSPERIPH = 1;
   
   logic        clk;
   logic        reset;
@@ -42,314 +43,321 @@ module testbench();
   logic [`XLEN-1:0] meminit;
 
   string tests32mmu[] = '{
-                      "rv32mmu/WALLY-VIRTUALMEMORY", "5000"
+    "rv32mmu/WALLY-VIRTUALMEMORY", "5000"
   };
 
   string tests64mmu[] = '{
-                      "rv64mmu/WALLY-VIRTUALMEMORY", "5000"
+    "rv64mmu/WALLY-VIRTUALMEMORY", "5000"
   };
 
   string tests64f[] = '{
-                    "rv64f/I-FADD-S-01", "2000",
-                    "rv64f/I-FCLASS-S-01", "2000"
+    "rv64f/I-FADD-S-01", "2000",
+    "rv64f/I-FCLASS-S-01", "2000"
   };
 
   string tests64a[] = '{
-                    "rv64a/WALLY-AMO", "2110",
-                    "rv64a/WALLY-LRSC", "2110"
+    "rv64a/WALLY-AMO", "2110",
+    "rv64a/WALLY-LRSC", "2110"
   };
+
   string tests64m[] = '{
-                    "rv64m/I-MUL-01", "3000",
-                    "rv64m/I-MULH-01", "3000",
-                    "rv64m/I-MULHSU-01", "3000",
-                    "rv64m/I-MULHU-01", "3000",
-                    "rv64m/I-MULW-01", "3000"
-//                    "rv64m/I-DIV-01", "3000",
-//                    "rv64m/I-DIVU-01", "3000"
- //                   "rv64m/I-DIVUW-01", "3000",
- //                   "rv64m/I-DIVW-01", "3000",
-//                    "rv64m/I-REM-01", "3000",
-//                    "rv64m/I-REMU-01", "3000",
-//                    "rv64m/I-REMUW-01", "3000",
-//                    "rv64m/I-REMW-01", "3000"
+    "rv64m/I-MUL-01", "3000",
+    "rv64m/I-MULH-01", "3000",
+    "rv64m/I-MULHSU-01", "3000",
+    "rv64m/I-MULHU-01", "3000",
+    "rv64m/I-MULW-01", "3000"
+    //"rv64m/I-DIV-01", "3000",
+    //"rv64m/I-DIVU-01", "3000"
+    //"rv64m/I-DIVUW-01", "3000",
+    //"rv64m/I-DIVW-01", "3000",
+    //"rv64m/I-REM-01", "3000",
+    //"rv64m/I-REMU-01", "3000",
+    //"rv64m/I-REMUW-01", "3000",
+    //"rv64m/I-REMW-01", "3000"
   };
+
   string tests64ic[] = '{
-                     "rv64ic/I-C-ADD-01", "3000",
-                     "rv64ic/I-C-ADDI-01", "3000",
-                     "rv64ic/I-C-ADDIW-01", "3000",
-                     "rv64ic/I-C-ADDW-01", "3000",
-                     "rv64ic/I-C-AND-01", "3000",
-                     "rv64ic/I-C-ANDI-01", "3000",
-                     "rv64ic/I-C-BEQZ-01", "3000",
-                     "rv64ic/I-C-BNEZ-01", "3000",
-                     "rv64ic/I-C-EBREAK-01", "2000",
-                     "rv64ic/I-C-J-01", "3000",
-                     "rv64ic/I-C-JALR-01", "4000",
-                     "rv64ic/I-C-JR-01", "4000",
-                     "rv64ic/I-C-LD-01", "3420",
-                     "rv64ic/I-C-LDSP-01", "3420",
-                     "rv64ic/I-C-LI-01", "3000",
-                     "rv64ic/I-C-LUI-01", "2000",
-                     "rv64ic/I-C-LW-01", "3110",
-                     "rv64ic/I-C-LWSP-01", "3110",
-                     "rv64ic/I-C-MV-01", "3000",
-                     "rv64ic/I-C-NOP-01", "2000",
-                     "rv64ic/I-C-OR-01", "3000",
-                     "rv64ic/I-C-SD-01", "3000",
-                     "rv64ic/I-C-SDSP-01", "3000",
-                     "rv64ic/I-C-SLLI-01", "3000",
-                     "rv64ic/I-C-SRAI-01", "3000",
-                     "rv64ic/I-C-SRLI-01", "3000",
-                     "rv64ic/I-C-SUB-01", "3000",
-                     "rv64ic/I-C-SUBW-01", "3000",
-                     "rv64ic/I-C-SW-01", "3000",
-                     "rv64ic/I-C-SWSP-01", "3000",
-                     "rv64ic/I-C-XOR-01", "3000"
+    "rv64ic/I-C-ADD-01", "3000",
+    "rv64ic/I-C-ADDI-01", "3000",
+    "rv64ic/I-C-ADDIW-01", "3000",
+    "rv64ic/I-C-ADDW-01", "3000",
+    "rv64ic/I-C-AND-01", "3000",
+    "rv64ic/I-C-ANDI-01", "3000",
+    "rv64ic/I-C-BEQZ-01", "3000",
+    "rv64ic/I-C-BNEZ-01", "3000",
+    "rv64ic/I-C-EBREAK-01", "2000",
+    "rv64ic/I-C-J-01", "3000",
+    "rv64ic/I-C-JALR-01", "4000",
+    "rv64ic/I-C-JR-01", "4000",
+    "rv64ic/I-C-LD-01", "3420",
+    "rv64ic/I-C-LDSP-01", "3420",
+    "rv64ic/I-C-LI-01", "3000",
+    "rv64ic/I-C-LUI-01", "2000",
+    "rv64ic/I-C-LW-01", "3110",
+    "rv64ic/I-C-LWSP-01", "3110",
+    "rv64ic/I-C-MV-01", "3000",
+    "rv64ic/I-C-NOP-01", "2000",
+    "rv64ic/I-C-OR-01", "3000",
+    "rv64ic/I-C-SD-01", "3000",
+    "rv64ic/I-C-SDSP-01", "3000",
+    "rv64ic/I-C-SLLI-01", "3000",
+    "rv64ic/I-C-SRAI-01", "3000",
+    "rv64ic/I-C-SRLI-01", "3000",
+    "rv64ic/I-C-SUB-01", "3000",
+    "rv64ic/I-C-SUBW-01", "3000",
+    "rv64ic/I-C-SW-01", "3000",
+    "rv64ic/I-C-SWSP-01", "3000",
+    "rv64ic/I-C-XOR-01", "3000"
   };
-string tests64iNOc[] = {
-                     "rv64i/I-MISALIGN_JMP-01","2000"
-  };
- string tests64i[] = '{                 
-                     "rv64i/I-ADD-01", "3000",
-                     "rv64i/I-ADDI-01", "3000",
-                     "rv64i/I-ADDIW-01", "3000",
-                     "rv64i/I-ADDW-01", "3000",
-                     "rv64i/I-AND-01", "3000",
-                     "rv64i/I-ANDI-01", "3000",
-                     "rv64i/I-AUIPC-01", "3000",
-                     "rv64i/I-BEQ-01", "4000",
-                     "rv64i/I-BGE-01", "4000",
-                     "rv64i/I-BGEU-01", "4000",
-                     "rv64i/I-BLT-01", "4000",
-                     "rv64i/I-BLTU-01", "4000",
-                     "rv64i/I-BNE-01", "4000",
-                     "rv64i/I-DELAY_SLOTS-01", "2000",
-                     "rv64i/I-EBREAK-01", "2000",
-                     "rv64i/I-ECALL-01", "2000",
-                     "rv64i/I-ENDIANESS-01", "2010",
-                     "rv64i/I-IO-01", "2050",
-                     "rv64i/I-JAL-01", "3000",
-                     "rv64i/I-JALR-01", "4000",
-                     "rv64i/I-LB-01", "4020",
-                     "rv64i/I-LBU-01", "4020",
-                     "rv64i/I-LD-01", "4420",
-                     "rv64i/I-LH-01", "4050",
-                     "rv64i/I-LHU-01", "4050",
-                     "rv64i/I-LUI-01", "2000",
-                     "rv64i/I-LW-01", "4110",
-                     "rv64i/I-LWU-01", "4110", 
-                     "rv64i/I-MISALIGN_LDST-01", "2010",
-                     "rv64i/I-NOP-01", "2000",
-                     "rv64i/I-OR-01", "3000",
-                     "rv64i/I-ORI-01", "3000",
-                     "rv64i/I-RF_size-01", "2000",
-                     "rv64i/I-RF_width-01", "2000",
-                     "rv64i/I-RF_x0-01", "2010",
-                     "rv64i/I-SB-01", "4000",
-                     "rv64i/I-SD-01", "4000",
-                     "rv64i/I-SH-01", "4000",
-                     "rv64i/I-SLL-01", "3000",
-                     "rv64i/I-SLLI-01", "3000",
-                     "rv64i/I-SLLIW-01", "3000",
-                     "rv64i/I-SLLW-01", "3000",
-                     "rv64i/I-SLT-01", "3000",
-                     "rv64i/I-SLTI-01", "3000",
-                     "rv64i/I-SLTIU-01", "3000",
-                     "rv64i/I-SLTU-01", "3000",
-                     "rv64i/I-SRA-01", "3000",
-                     "rv64i/I-SRAI-01", "3000",
-                     "rv64i/I-SRAIW-01", "3000",
-                     "rv64i/I-SRAW-01", "3000",
-                     "rv64i/I-SRL-01", "3000",
-                     "rv64i/I-SRLI-01", "3000",
-                     "rv64i/I-SRLIW-01", "3000",
-                     "rv64i/I-SRLW-01", "3000",
-                     "rv64i/I-SUB-01", "3000",
-                     "rv64i/I-SUBW-01", "3000",
-                     "rv64i/I-SW-01", "4000",
-                     "rv64i/I-XOR-01", "3000",
-                     "rv64i/I-XORI-01", "3000",
-                     "rv64i/WALLY-ADD", "4000",
-                     "rv64i/WALLY-SUB", "4000",
-                     "rv64i/WALLY-ADDI", "3000",
-                     "rv64i/WALLY-ANDI", "3000",
-                     "rv64i/WALLY-ORI", "3000",
-                     "rv64i/WALLY-XORI", "3000",
-                     "rv64i/WALLY-SLTI", "3000",
-                     "rv64i/WALLY-SLTIU", "3000",
-                     "rv64i/WALLY-SLLI", "3000",
-                     "rv64i/WALLY-SRLI", "3000",
-                     "rv64i/WALLY-SRAI", "3000",
-                     "rv64i/WALLY-LOAD", "11bf0",
-                     "rv64i/WALLY-JAL", "4000",
-                     "rv64i/WALLY-JALR", "3000",
-                     "rv64i/WALLY-STORE", "3000",
-                     "rv64i/WALLY-ADDIW", "3000",
-                     "rv64i/WALLY-SLLIW", "3000",
-                     "rv64i/WALLY-SRLIW", "3000",
-                     "rv64i/WALLY-SRAIW", "3000",
-                     "rv64i/WALLY-ADDW", "4000",
-                     "rv64i/WALLY-SUBW", "4000",
-                     "rv64i/WALLY-SLLW", "3000",
-                     "rv64i/WALLY-SRLW", "3000",
-                     "rv64i/WALLY-SRAW", "3000",
-                     "rv64i/WALLY-BEQ" ,"5000",
-                     "rv64i/WALLY-BNE", "5000 ",
-                      "rv64i/WALLY-BLTU", "5000 ",
-                      "rv64i/WALLY-BLT", "5000",
-                       "rv64i/WALLY-BGE", "5000 ",
-                      "rv64i/WALLY-BGEU", "5000 ",
-                      "rv64i/WALLY-CSRRW", "4000",
-                      "rv64i/WALLY-CSRRS", "4000",
-                      "rv64i/WALLY-CSRRC", "5000",
-                      "rv64i/WALLY-CSRRWI", "4000",
-                      "rv64i/WALLY-CSRRSI", "4000",
-                      "rv64i/WALLY-CSRRCI", "4000"
 
+  string tests64iNOc[] = {
+    "rv64i/I-MISALIGN_JMP-01","2000"
   };
+
+  string tests64i[] = '{
+    "rv64i/I-ADD-01", "3000",
+    "rv64i/I-ADDI-01", "3000",
+    "rv64i/I-ADDIW-01", "3000",
+    "rv64i/I-ADDW-01", "3000",
+    "rv64i/I-AND-01", "3000",
+    "rv64i/I-ANDI-01", "3000",
+    "rv64i/I-AUIPC-01", "3000",
+    "rv64i/I-BEQ-01", "4000",
+    "rv64i/I-BGE-01", "4000",
+    "rv64i/I-BGEU-01", "4000",
+    "rv64i/I-BLT-01", "4000",
+    "rv64i/I-BLTU-01", "4000",
+    "rv64i/I-BNE-01", "4000",
+    "rv64i/I-DELAY_SLOTS-01", "2000",
+    "rv64i/I-EBREAK-01", "2000",
+    "rv64i/I-ECALL-01", "2000",
+    "rv64i/I-ENDIANESS-01", "2010",
+    "rv64i/I-IO-01", "2050",
+    "rv64i/I-JAL-01", "3000",
+    "rv64i/I-JALR-01", "4000",
+    "rv64i/I-LB-01", "4020",
+    "rv64i/I-LBU-01", "4020",
+    "rv64i/I-LD-01", "4420",
+    "rv64i/I-LH-01", "4050",
+    "rv64i/I-LHU-01", "4050",
+    "rv64i/I-LUI-01", "2000",
+    "rv64i/I-LW-01", "4110",
+    "rv64i/I-LWU-01", "4110", 
+    "rv64i/I-MISALIGN_LDST-01", "2010",
+    "rv64i/I-NOP-01", "2000",
+    "rv64i/I-OR-01", "3000",
+    "rv64i/I-ORI-01", "3000",
+    "rv64i/I-RF_size-01", "2000",
+    "rv64i/I-RF_width-01", "2000",
+    "rv64i/I-RF_x0-01", "2010",
+    "rv64i/I-SB-01", "4000",
+    "rv64i/I-SD-01", "4000",
+    "rv64i/I-SH-01", "4000",
+    "rv64i/I-SLL-01", "3000",
+    "rv64i/I-SLLI-01", "3000",
+    "rv64i/I-SLLIW-01", "3000",
+    "rv64i/I-SLLW-01", "3000",
+    "rv64i/I-SLT-01", "3000",
+    "rv64i/I-SLTI-01", "3000",
+    "rv64i/I-SLTIU-01", "3000",
+    "rv64i/I-SLTU-01", "3000",
+    "rv64i/I-SRA-01", "3000",
+    "rv64i/I-SRAI-01", "3000",
+    "rv64i/I-SRAIW-01", "3000",
+    "rv64i/I-SRAW-01", "3000",
+    "rv64i/I-SRL-01", "3000",
+    "rv64i/I-SRLI-01", "3000",
+    "rv64i/I-SRLIW-01", "3000",
+    "rv64i/I-SRLW-01", "3000",
+    "rv64i/I-SUB-01", "3000",
+    "rv64i/I-SUBW-01", "3000",
+    "rv64i/I-SW-01", "4000",
+    "rv64i/I-XOR-01", "3000",
+    "rv64i/I-XORI-01", "3000",
+    "rv64i/WALLY-ADD", "4000",
+    "rv64i/WALLY-SUB", "4000",
+    "rv64i/WALLY-ADDI", "3000",
+    "rv64i/WALLY-ANDI", "3000",
+    "rv64i/WALLY-ORI", "3000",
+    "rv64i/WALLY-XORI", "3000",
+    "rv64i/WALLY-SLTI", "3000",
+    "rv64i/WALLY-SLTIU", "3000",
+    "rv64i/WALLY-SLLI", "3000",
+    "rv64i/WALLY-SRLI", "3000",
+    "rv64i/WALLY-SRAI", "3000",
+    "rv64i/WALLY-LOAD", "11bf0",
+    "rv64i/WALLY-JAL", "4000",
+    "rv64i/WALLY-JALR", "3000",
+    "rv64i/WALLY-STORE", "3000",
+    "rv64i/WALLY-ADDIW", "3000",
+    "rv64i/WALLY-SLLIW", "3000",
+    "rv64i/WALLY-SRLIW", "3000",
+    "rv64i/WALLY-SRAIW", "3000",
+    "rv64i/WALLY-ADDW", "4000",
+    "rv64i/WALLY-SUBW", "4000",
+    "rv64i/WALLY-SLLW", "3000",
+    "rv64i/WALLY-SRLW", "3000",
+    "rv64i/WALLY-SRAW", "3000",
+    "rv64i/WALLY-BEQ" ,"5000",
+    "rv64i/WALLY-BNE", "5000 ",
+    "rv64i/WALLY-BLTU", "5000 ",
+    "rv64i/WALLY-BLT", "5000",
+    "rv64i/WALLY-BGE", "5000 ",
+    "rv64i/WALLY-BGEU", "5000 ",
+    "rv64i/WALLY-CSRRW", "4000",
+    "rv64i/WALLY-CSRRS", "4000",
+    "rv64i/WALLY-CSRRC", "5000",
+    "rv64i/WALLY-CSRRWI", "4000",
+    "rv64i/WALLY-CSRRSI", "4000",
+    "rv64i/WALLY-CSRRCI", "4000"
+  };
+
   string tests32a[] = '{
-                    "rv64a/WALLY-AMO", "2110",
-                    "rv64a/WALLY-LRSC", "2110"
+    "rv64a/WALLY-AMO", "2110",
+    "rv64a/WALLY-LRSC", "2110"
   };
-  string tests32m[] = '{
-                    "rv32m/I-MUL-01", "2000",
-                    "rv32m/I-MULH-01", "2000",
-                    "rv32m/I-MULHSU-01", "2000",
-                    "rv32m/I-MULHU-01", "2000"
-//                    "rv32m/I-DIV-01", "2000",
-//                    "rv32m/I-DIVU-01", "2000",
-//                    "rv32m/I-REM-01", "2000",
-//                    "rv32m/I-REMU-01", "2000"
-  };
-string tests32ic[] = '{
-                     "rv32ic/I-C-ADD-01", "2000",
-                     "rv32ic/I-C-ADDI-01", "2000",
-                     "rv32ic/I-C-AND-01", "2000",
-                     "rv32ic/I-C-ANDI-01", "2000",
-                     "rv32ic/I-C-BEQZ-01", "2000",
-                     "rv32ic/I-C-BNEZ-01", "2000",
-                     "rv32ic/I-C-EBREAK-01", "2000",
-                     "rv32ic/I-C-J-01", "2000",
-                     "rv32ic/I-C-JALR-01", "3000",
-                     "rv32ic/I-C-JR-01", "3000",
-                     "rv32ic/I-C-LI-01", "2000",
-                     "rv32ic/I-C-LUI-01", "2000",
-                     "rv32ic/I-C-LW-01", "2110",
-                     "rv32ic/I-C-LWSP-01", "2110",
-                     "rv32ic/I-C-MV-01", "2000",
-                     "rv32ic/I-C-NOP-01", "2000",
-                     "rv32ic/I-C-OR-01", "2000",
-                     "rv32ic/I-C-SLLI-01", "2000",
-                     "rv32ic/I-C-SRAI-01", "2000",
-                     "rv32ic/I-C-SRLI-01", "2000",
-                     "rv32ic/I-C-SUB-01", "2000",
-                     "rv32ic/I-C-SW-01", "2000",
-                     "rv32ic/I-C-SWSP-01", "2000",
-                     "rv32ic/I-C-XOR-01", "2000" 
-};
-string tests32iNOc[] = {
-                     "rv32i/I-MISALIGN_JMP-01","2000"
-};
-string tests32i[] = {
-                     "rv32i/I-ADD-01", "2000",
-                     "rv32i/I-ADDI-01","2000",
-                     "rv32i/I-AND-01","2000",
-                     "rv32i/I-ANDI-01","2000",
-                     "rv32i/I-AUIPC-01","2000",
-                     "rv32i/I-BEQ-01","3000",
-                     "rv32i/I-BGE-01","3000",
-                     "rv32i/I-BGEU-01","3000",
-                     "rv32i/I-BLT-01","3000",
-                     "rv32i/I-BLTU-01","3000",
-                     "rv32i/I-BNE-01","3000",
-                     "rv32i/I-DELAY_SLOTS-01","2000",
-                     "rv32i/I-EBREAK-01","2000",
-                     "rv32i/I-ECALL-01","2000",
-                     "rv32i/I-ENDIANESS-01","2010",
-                     "rv32i/I-IO-01","2030",
-                     "rv32i/I-JAL-01","3000",
-                     "rv32i/I-JALR-01","3000",
-                     "rv32i/I-LB-01","3020",
-                     "rv32i/I-LBU-01","3020",
-                     "rv32i/I-LH-01","3050",
-                     "rv32i/I-LHU-01","3050",
-                     "rv32i/I-LUI-01","2000",
-                     "rv32i/I-LW-01","3110",
-                     "rv32i/I-MISALIGN_LDST-01","2010",
-                     "rv32i/I-NOP-01","2000",
-                     "rv32i/I-OR-01","2000",
-                     "rv32i/I-ORI-01","2000",
-                     "rv32i/I-RF_size-01","2000",
-                     "rv32i/I-RF_width-01","2000",
-                     "rv32i/I-RF_x0-01","2010",
-                     "rv32i/I-SB-01","3000",
-                     "rv32i/I-SH-01","3000",
-                     "rv32i/I-SLL-01","2000",
-                     "rv32i/I-SLLI-01","2000",
-                     "rv32i/I-SLT-01","2000",
-                     "rv32i/I-SLTI-01","2000",
-                     "rv32i/I-SLTIU-01","2000",
-                     "rv32i/I-SLTU-01","2000",
-                     "rv32i/I-SRA-01","2000",
-                     "rv32i/I-SRAI-01","2000",
-                     "rv32i/I-SRL-01","2000",
-                     "rv32i/I-SRLI-01","2000",
-                     "rv32i/I-SUB-01","2000",
-                     "rv32i/I-SW-01","3000",
-                     "rv32i/I-XOR-01","2000",
-                     "rv32i/I-XORI-01","2000",
-                     "rv32i/WALLY-ADD", "3000",
-                     "rv32i/WALLY-SUB", "3000",
-                     "rv32i/WALLY-ADDI", "2000",
-                     "rv32i/WALLY-ANDI", "2000",
-                     "rv32i/WALLY-ORI", "2000",
-                     "rv32i/WALLY-XORI", "2000",
-                     "rv32i/WALLY-SLTI", "2000",
-                     "rv32i/WALLY-SLTIU", "2000",
-                     "rv32i/WALLY-SLLI", "2000",
-                     "rv32i/WALLY-SRLI", "2000",
-                     "rv32i/WALLY-SRAI", "2000",
-                     "rv32i/WALLY-LOAD", "11c00",
-                     "rv32i/WALLY-SUB", "3000",
-                     "rv32i/WALLY-STORE", "2000",
-                     "rv32i/WALLY-JAL", "3000",
-                     "rv32i/WALLY-JALR", "2000",
-                     "rv32i/WALLY-BEQ" ,"4000",
-                     "rv32i/WALLY-BNE", "4000 ",
-                      "rv32i/WALLY-BLTU", "4000 ",
-                      "rv32i/WALLY-BLT", "4000",
-                       "rv32i/WALLY-BGE", "4000 ",
-                      "rv32i/WALLY-BGEU", "4000 ",
-                      "rv32i/WALLY-CSRRW", "3000",
-                      "rv32i/WALLY-CSRRS", "3000",
-                      "rv32i/WALLY-CSRRC", "4000",
-                      "rv32i/WALLY-CSRRWI", "3000",
-                      "rv32i/WALLY-CSRRSI", "3000",
-                      "rv32i/WALLY-CSRRCI", "3000"
 
-};
+  string tests32m[] = '{
+    "rv32m/I-MUL-01", "2000",
+    "rv32m/I-MULH-01", "2000",
+    "rv32m/I-MULHSU-01", "2000",
+    "rv32m/I-MULHU-01", "2000"
+    //"rv32m/I-DIV-01", "2000",
+    //"rv32m/I-DIVU-01", "2000",
+    //"rv32m/I-REM-01", "2000",
+    //"rv32m/I-REMU-01", "2000"
+  };
+
+  string tests32ic[] = '{
+    "rv32ic/I-C-ADD-01", "2000",
+    "rv32ic/I-C-ADDI-01", "2000",
+    "rv32ic/I-C-AND-01", "2000",
+    "rv32ic/I-C-ANDI-01", "2000",
+    "rv32ic/I-C-BEQZ-01", "2000",
+    "rv32ic/I-C-BNEZ-01", "2000",
+    "rv32ic/I-C-EBREAK-01", "2000",
+    "rv32ic/I-C-J-01", "2000",
+    "rv32ic/I-C-JALR-01", "3000",
+    "rv32ic/I-C-JR-01", "3000",
+    "rv32ic/I-C-LI-01", "2000",
+    "rv32ic/I-C-LUI-01", "2000",
+    "rv32ic/I-C-LW-01", "2110",
+    "rv32ic/I-C-LWSP-01", "2110",
+    "rv32ic/I-C-MV-01", "2000",
+    "rv32ic/I-C-NOP-01", "2000",
+    "rv32ic/I-C-OR-01", "2000",
+    "rv32ic/I-C-SLLI-01", "2000",
+    "rv32ic/I-C-SRAI-01", "2000",
+    "rv32ic/I-C-SRLI-01", "2000",
+    "rv32ic/I-C-SUB-01", "2000",
+    "rv32ic/I-C-SW-01", "2000",
+    "rv32ic/I-C-SWSP-01", "2000",
+    "rv32ic/I-C-XOR-01", "2000"
+  };
+
+  string tests32iNOc[] = {
+    "rv32i/I-MISALIGN_JMP-01","2000"
+  };
+
+  string tests32i[] = {
+    "rv32i/I-ADD-01", "2000",
+    "rv32i/I-ADDI-01","2000",
+    "rv32i/I-AND-01","2000",
+    "rv32i/I-ANDI-01","2000",
+    "rv32i/I-AUIPC-01","2000",
+    "rv32i/I-BEQ-01","3000",
+    "rv32i/I-BGE-01","3000",
+    "rv32i/I-BGEU-01","3000",
+    "rv32i/I-BLT-01","3000",
+    "rv32i/I-BLTU-01","3000",
+    "rv32i/I-BNE-01","3000",
+    "rv32i/I-DELAY_SLOTS-01","2000",
+    "rv32i/I-EBREAK-01","2000",
+    "rv32i/I-ECALL-01","2000",
+    "rv32i/I-ENDIANESS-01","2010",
+    "rv32i/I-IO-01","2030",
+    "rv32i/I-JAL-01","3000",
+    "rv32i/I-JALR-01","3000",
+    "rv32i/I-LB-01","3020",
+    "rv32i/I-LBU-01","3020",
+    "rv32i/I-LH-01","3050",
+    "rv32i/I-LHU-01","3050",
+    "rv32i/I-LUI-01","2000",
+    "rv32i/I-LW-01","3110",
+    "rv32i/I-MISALIGN_LDST-01","2010",
+    "rv32i/I-NOP-01","2000",
+    "rv32i/I-OR-01","2000",
+    "rv32i/I-ORI-01","2000",
+    "rv32i/I-RF_size-01","2000",
+    "rv32i/I-RF_width-01","2000",
+    "rv32i/I-RF_x0-01","2010",
+    "rv32i/I-SB-01","3000",
+    "rv32i/I-SH-01","3000",
+    "rv32i/I-SLL-01","2000",
+    "rv32i/I-SLLI-01","2000",
+    "rv32i/I-SLT-01","2000",
+    "rv32i/I-SLTI-01","2000",
+    "rv32i/I-SLTIU-01","2000",
+    "rv32i/I-SLTU-01","2000",
+    "rv32i/I-SRA-01","2000",
+    "rv32i/I-SRAI-01","2000",
+    "rv32i/I-SRL-01","2000",
+    "rv32i/I-SRLI-01","2000",
+    "rv32i/I-SUB-01","2000",
+    "rv32i/I-SW-01","3000",
+    "rv32i/I-XOR-01","2000",
+    "rv32i/I-XORI-01","2000",
+    "rv32i/WALLY-ADD", "3000",
+    "rv32i/WALLY-SUB", "3000",
+    "rv32i/WALLY-ADDI", "2000",
+    "rv32i/WALLY-ANDI", "2000",
+    "rv32i/WALLY-ORI", "2000",
+    "rv32i/WALLY-XORI", "2000",
+    "rv32i/WALLY-SLTI", "2000",
+    "rv32i/WALLY-SLTIU", "2000",
+    "rv32i/WALLY-SLLI", "2000",
+    "rv32i/WALLY-SRLI", "2000",
+    "rv32i/WALLY-SRAI", "2000",
+    "rv32i/WALLY-LOAD", "11c00",
+    "rv32i/WALLY-SUB", "3000",
+    "rv32i/WALLY-STORE", "2000",
+    "rv32i/WALLY-JAL", "3000",
+    "rv32i/WALLY-JALR", "2000",
+    "rv32i/WALLY-BEQ" ,"4000",
+    "rv32i/WALLY-BNE", "4000 ",
+    "rv32i/WALLY-BLTU", "4000 ",
+    "rv32i/WALLY-BLT", "4000",
+    "rv32i/WALLY-BGE", "4000 ",
+    "rv32i/WALLY-BGEU", "4000 ",
+    "rv32i/WALLY-CSRRW", "3000",
+    "rv32i/WALLY-CSRRS", "3000",
+    "rv32i/WALLY-CSRRC", "4000",
+    "rv32i/WALLY-CSRRWI", "3000",
+    "rv32i/WALLY-CSRRSI", "3000",
+    "rv32i/WALLY-CSRRCI", "3000"
+  };
 
   string testsBP64[] = '{
-		       "rv64BP/reg-test", "10000"
-	 };
+    "rv64BP/reg-test", "10000"
+  };
 
-   // string tests64p[] = '{
-   //           "rv64p/WALLY-CAUSE", "3000",
-   //           "rv64p/WALLY-EPC", "3000",
-   //           "rv64p/WALLY-TVAL", "3000"
-   // };
+  string tests64p[] = '{
+    "rv64p/WALLY-CAUSE", "3000",
+    "rv64p/WALLY-EPC", "3000",
+    "rv64p/WALLY-TVAL", "3000",
+    "rv64p/WALLY-MARCHID", "4000",
+    "rv64p/WALLY-MIMPID", "4000",
+    "rv64p/WALLY-MHARTID", "4000",
+    "rv64p/WALLY-MVENDORID", "4000"
+  };
 
-   
+  string tests64periph[] = '{
+    "rv64i-periph/WALLY-PLIC", "2000"
+  };
 
-   string tests64p[] = '{
-             "rv64p/WALLY-CAUSE", "3000",
-             "rv64p/WALLY-EPC", "3000",
-             "rv64p/WALLY-TVAL", "3000",
-             "rv64p/WALLY-MARCHID", "4000",
-             "rv64p/WALLY-MIMPID", "4000",
-             "rv64p/WALLY-MHARTID", "4000",
-             "rv64p/WALLY-MVENDORID", "4000"
-   };
+  string tests32periph[] = '{
+    "rv32i-periph/WALLY-PLIC", "2000"
+  };
 
    
 
@@ -374,9 +382,11 @@ string tests32i[] = {
   initial begin
     if (`XLEN == 64) begin // RV64
       if (TESTSBP) begin
-	      tests = testsBP64;
+        tests = testsBP64;
+      end if (TESTSPERIPH) begin 
+        tests = tests64periph;
       end else begin 
-	      tests = {tests64i};
+        tests = {tests64i,tests64periph};
         if (`C_SUPPORTED) tests = {tests, tests64ic};
         else              tests = {tests, tests64iNOc};
         if (`M_SUPPORTED) tests = {tests, tests64m};
@@ -385,19 +395,22 @@ string tests32i[] = {
         if (`A_SUPPORTED) tests = {tests, tests64a};
         if (`MEM_VIRTMEM) tests = {tests64mmu, tests};
       end
- //     tests = {tests64a, tests};
+      //tests = {tests64a, tests};
       tests = {tests, tests64p};
     end else begin // RV32
       // *** add the 32 bit bp tests
-      tests = {tests32i};
-      if (`C_SUPPORTED % 2 == 1) tests = {tests, tests32ic};    
-      else                       tests = {tests, tests32iNOc};
-      if (`M_SUPPORTED % 2 == 1) tests = {tests, tests32m};
-      // if (`F_SUPPORTED) tests = {tests32f, tests};
-      if (`A_SUPPORTED) tests = {tests, tests32a};
-      if (`MEM_VIRTMEM) tests = {tests32mmu, tests};
+      if (TESTSPERIPH) begin 
+        tests = tests32periph;
+      end else begin
+          tests = {tests32i,tests32periph};
+          if (`C_SUPPORTED % 2 == 1) tests = {tests, tests32ic};    
+          else                       tests = {tests, tests32iNOc};
+          if (`M_SUPPORTED % 2 == 1) tests = {tests, tests32m};
+          // if (`F_SUPPORTED) tests = {tests32f, tests};
+          if (`A_SUPPORTED) tests = {tests, tests32a};
+          if (`MEM_VIRTMEM) tests = {tests32mmu, tests};
+      end
     end
-
     //tests = tests64p;
   end