diff --git a/tests/riscv-coremark/transferobjdump.sh b/tests/riscv-coremark/transferobjdump.sh
new file mode 100755
index 000000000..69578566a
--- /dev/null
+++ b/tests/riscv-coremark/transferobjdump.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+./build-coremark.sh
+
+riscv64-unknown-elf-objdump -D coremark.bare.riscv > coremarkcodemod.bare.riscv.objdump 
+cp coremarkcodemod.bare.riscv.objdump ~/riscv-wally/tests/imperas-riscv-tests/riscv-ovpsim-plus/examples/CoreMark/.
+pushd ~/riscv-wally/tests/imperas-riscv-tests/riscv-ovpsim-plus/examples/CoreMark
+./exe2memfile.pl coremarkcodemod.bare.riscv
+popd
diff --git a/tests/riscv-coremark/transferobjump.sh b/tests/riscv-coremark/transferobjump.sh
deleted file mode 100755
index f27f73f5b..000000000
--- a/tests/riscv-coremark/transferobjump.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-./build-coremark.sh
-
-riscv64-unknown-elf-objdump -D coremark.bare.riscv > coremarkcodemod.bare.riscv.objdump 
-cp coremarkcodemod.bare.riscv.objdump ~/riscv-wally/imperas-riscv-tests/riscv-ovpsim-plus/examples/CoreMark/.
-pushd ~/riscv-wally/imperas-riscv-tests/riscv-ovpsim-plus/examples/CoreMark
-./exe2memfile.pl coremarkcodemod.bare.riscv
-popd
diff --git a/wally-pipelined/regression/old/wally-coremark_bare.do b/wally-pipelined/regression/wally-coremark_bare.do
similarity index 100%
rename from wally-pipelined/regression/old/wally-coremark_bare.do
rename to wally-pipelined/regression/wally-coremark_bare.do
diff --git a/wally-pipelined/testbench/testbench.sv b/wally-pipelined/testbench/testbench.sv
index 13ba7e16a..ee806286c 100644
--- a/wally-pipelined/testbench/testbench.sv
+++ b/wally-pipelined/testbench/testbench.sv
@@ -317,7 +317,6 @@ module riscvassertions;
     assert (2**$clog2(`DCACHE_WAYSIZEINBYTES) == `DCACHE_WAYSIZEINBYTES) else $error("DCACHE_WAYSIZEINBYTES must be a power of 2");
     assert (2**$clog2(`ICACHE_BLOCKLENINBITS) == `ICACHE_BLOCKLENINBITS) else $error("ICACHE_BLOCKLENINBITS must be a power of 2");
     assert (2**$clog2(`ICACHE_WAYSIZEINBYTES) == `ICACHE_WAYSIZEINBYTES) else $error("ICACHE_WAYSIZEINBYTES must be a power of 2");
-    assert (`ICACHE_NUMWAYS == 1 || `MEM_ICACHE == 0) else $warning("Multiple Instruction Cache ways not yet implemented");
     assert (2**$clog2(`ITLB_ENTRIES) == `ITLB_ENTRIES) else $error("ITLB_ENTRIES must be a power of 2");
     assert (2**$clog2(`DTLB_ENTRIES) == `DTLB_ENTRIES) else $error("DTLB_ENTRIES must be a power of 2");
     assert (`TIM_RANGE >= 56'h07FFFFFF) else $warning("Some regression tests will fail if TIM_RANGE is less than 56'h07FFFFFF");