diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-ADD.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-ADD.S
deleted file mode 100644
index 26b2f501c..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-ADD.S
+++ /dev/null
@@ -1,142 +0,0 @@
-///////////////////////////////////////////
-// ../wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-ADD.S
-// David_Harris@hmc.edu & Katherine Parry
-// Created 2022-06-17 22:58:09.914370//
-// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, 
-// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software 
-// is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
-// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-///////////////////////////////////////////
-
-#include "model_test.h"
-#include "arch_test.h"
-RVTEST_ISA("RV64I")
-
-.section .text.init
-.globl rvtest_entry_point
-rvtest_entry_point:
-RVMODEL_BOOT
-RVTEST_CODE_BEGIN
-
-RVTEST_SIGBASE( x6, wally_signature)
-
-RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",add)
-
-# Testcase 0:  rs1:x20(0x0000000000000000), rs2:x22(0x0000000000000000), result rd:x3(0x0000000000000000)
-li x20, MASK_XLEN(0x0000000000000000)
-li x22, MASK_XLEN(0x0000000000000000)
-ADD x3, x20, x22
-sd x3, 0(x6)
-
-# Testcase 1:  rs1:x1(0x0000000000000000), rs2:x4(0x0000000000000001), result rd:x21(0x0000000000000001)
-li x1, MASK_XLEN(0x0000000000000000)
-li x4, MASK_XLEN(0x0000000000000001)
-ADD x21, x1, x4
-sd x21, 8(x6)
-
-# Testcase 2:  rs1:x7(0x0000000000000000), rs2:x20(0xffffffffffffffff), result rd:x27(0xffffffffffffffff)
-li x7, MASK_XLEN(0x0000000000000000)
-li x20, MASK_XLEN(0xffffffffffffffff)
-ADD x27, x7, x20
-sd x27, 16(x6)
-
-# Testcase 3:  rs1:x19(0x0000000000000001), rs2:x4(0x0000000000000000), result rd:x13(0x0000000000000001)
-li x19, MASK_XLEN(0x0000000000000001)
-li x4, MASK_XLEN(0x0000000000000000)
-ADD x13, x19, x4
-sd x13, 24(x6)
-
-# Testcase 4:  rs1:x3(0x0000000000000001), rs2:x12(0x0000000000000001), result rd:x27(0x0000000000000002)
-li x3, MASK_XLEN(0x0000000000000001)
-li x12, MASK_XLEN(0x0000000000000001)
-ADD x27, x3, x12
-sd x27, 32(x6)
-
-# Testcase 5:  rs1:x4(0x0000000000000001), rs2:x2(0xffffffffffffffff), result rd:x20(0x0000000000000000)
-li x4, MASK_XLEN(0x0000000000000001)
-li x2, MASK_XLEN(0xffffffffffffffff)
-ADD x20, x4, x2
-sd x20, 40(x6)
-
-# Testcase 6:  rs1:x1(0xffffffffffffffff), rs2:x7(0x0000000000000000), result rd:x31(0xffffffffffffffff)
-li x1, MASK_XLEN(0xffffffffffffffff)
-li x7, MASK_XLEN(0x0000000000000000)
-ADD x31, x1, x7
-sd x31, 48(x6)
-
-# Testcase 7:  rs1:x16(0xffffffffffffffff), rs2:x7(0x0000000000000001), result rd:x24(0x0000000000000000)
-li x16, MASK_XLEN(0xffffffffffffffff)
-li x7, MASK_XLEN(0x0000000000000001)
-ADD x24, x16, x7
-sd x24, 56(x6)
-
-# Testcase 8:  rs1:x26(0xffffffffffffffff), rs2:x2(0xffffffffffffffff), result rd:x30(0xfffffffffffffffe)
-li x26, MASK_XLEN(0xffffffffffffffff)
-li x2, MASK_XLEN(0xffffffffffffffff)
-ADD x30, x26, x2
-sd x30, 64(x6)
-
-# Testcase 9:  rs1:x20(0x05d51433ade9b2b4), rs2:x4(0x6cf55b158b53031d), result rd:x27(0x72ca6f49393cb5d1)
-li x20, MASK_XLEN(0x05d51433ade9b2b4)
-li x4, MASK_XLEN(0x6cf55b158b53031d)
-ADD x27, x20, x4
-sd x27, 72(x6)
-
-# Testcase 10:  rs1:x21(0x11ebcd49428a1c22), rs2:x10(0x126cbc8f38884479), result rd:x12(0x245889d87b12609b)
-li x21, MASK_XLEN(0x11ebcd49428a1c22)
-li x10, MASK_XLEN(0x126cbc8f38884479)
-ADD x12, x21, x10
-sd x12, 80(x6)
-
-# Testcase 11:  rs1:x15(0x2e2950656fa231e9), rs2:x2(0x80ee526e0fa07a3f), result rd:x20(0xaf17a2d37f42ac28)
-li x15, MASK_XLEN(0x2e2950656fa231e9)
-li x2, MASK_XLEN(0x80ee526e0fa07a3f)
-ADD x20, x15, x2
-sd x20, 88(x6)
-
-.EQU NUMTESTS,12
-
-RVTEST_CODE_END
-RVMODEL_HALT
-
-RVTEST_DATA_BEGIN
-.align 4
-rvtest_data:
-.word 0x98765432
-RVTEST_DATA_END
-
-RVMODEL_DATA_BEGIN
-
-
-wally_signature:
-    .fill NUMTESTS*(XLEN/32),4,0xdeadbeef
-
-#ifdef rvtest_mtrap_routine
-
-mtrap_sigptr:
-    .fill 64*(XLEN/32),4,0xdeadbeef
-
-#endif
-
-#ifdef rvtest_gpr_save
-
-gpr_save:
-    .fill 32*(XLEN/32),4,0xdeadbeef
-
-#endif
-sig_end_canary:
-.int 0x0
-rvtest_sig_end:
-
-RVMODEL_DATA_END
-// ../wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-ADD.S
-// David_Harris@hmc.edu & Katherine Parry
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SLT.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SLT.S
deleted file mode 100644
index 8dd500f83..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SLT.S
+++ /dev/null
@@ -1,142 +0,0 @@
-///////////////////////////////////////////
-// ../wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SLT.S
-// David_Harris@hmc.edu & Katherine Parry
-// Created 2022-06-17 22:58:09.916813//
-// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, 
-// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software 
-// is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
-// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-///////////////////////////////////////////
-
-#include "model_test.h"
-#include "arch_test.h"
-RVTEST_ISA("RV64I")
-
-.section .text.init
-.globl rvtest_entry_point
-rvtest_entry_point:
-RVMODEL_BOOT
-RVTEST_CODE_BEGIN
-
-RVTEST_SIGBASE( x6, wally_signature)
-
-RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",slt)
-
-# Testcase 0:  rs1:x18(0x0000000000000000), rs2:x9(0x0000000000000000), result rd:x5(0x0000000000000000)
-li x18, MASK_XLEN(0x0000000000000000)
-li x9, MASK_XLEN(0x0000000000000000)
-SLT x5, x18, x9
-sd x5, 0(x6)
-
-# Testcase 1:  rs1:x8(0x0000000000000000), rs2:x25(0x0000000000000001), result rd:x31(0x0000000000000001)
-li x8, MASK_XLEN(0x0000000000000000)
-li x25, MASK_XLEN(0x0000000000000001)
-SLT x31, x8, x25
-sd x31, 8(x6)
-
-# Testcase 2:  rs1:x16(0x0000000000000000), rs2:x12(0xffffffffffffffff), result rd:x20(0x0000000000000000)
-li x16, MASK_XLEN(0x0000000000000000)
-li x12, MASK_XLEN(0xffffffffffffffff)
-SLT x20, x16, x12
-sd x20, 16(x6)
-
-# Testcase 3:  rs1:x10(0x0000000000000001), rs2:x22(0x0000000000000000), result rd:x12(0x0000000000000000)
-li x10, MASK_XLEN(0x0000000000000001)
-li x22, MASK_XLEN(0x0000000000000000)
-SLT x12, x10, x22
-sd x12, 24(x6)
-
-# Testcase 4:  rs1:x19(0x0000000000000001), rs2:x31(0x0000000000000001), result rd:x29(0x0000000000000000)
-li x19, MASK_XLEN(0x0000000000000001)
-li x31, MASK_XLEN(0x0000000000000001)
-SLT x29, x19, x31
-sd x29, 32(x6)
-
-# Testcase 5:  rs1:x21(0x0000000000000001), rs2:x28(0xffffffffffffffff), result rd:x20(0x0000000000000000)
-li x21, MASK_XLEN(0x0000000000000001)
-li x28, MASK_XLEN(0xffffffffffffffff)
-SLT x20, x21, x28
-sd x20, 40(x6)
-
-# Testcase 6:  rs1:x5(0xffffffffffffffff), rs2:x23(0x0000000000000000), result rd:x10(0x0000000000000001)
-li x5, MASK_XLEN(0xffffffffffffffff)
-li x23, MASK_XLEN(0x0000000000000000)
-SLT x10, x5, x23
-sd x10, 48(x6)
-
-# Testcase 7:  rs1:x13(0xffffffffffffffff), rs2:x24(0x0000000000000001), result rd:x14(0x0000000000000001)
-li x13, MASK_XLEN(0xffffffffffffffff)
-li x24, MASK_XLEN(0x0000000000000001)
-SLT x14, x13, x24
-sd x14, 56(x6)
-
-# Testcase 8:  rs1:x27(0xffffffffffffffff), rs2:x21(0xffffffffffffffff), result rd:x3(0x0000000000000000)
-li x27, MASK_XLEN(0xffffffffffffffff)
-li x21, MASK_XLEN(0xffffffffffffffff)
-SLT x3, x27, x21
-sd x3, 64(x6)
-
-# Testcase 9:  rs1:x8(0x983631890063e42f), rs2:x21(0xb2d650af313b32b7), result rd:x15(0x0000000000000001)
-li x8, MASK_XLEN(0x983631890063e42f)
-li x21, MASK_XLEN(0xb2d650af313b32b7)
-SLT x15, x8, x21
-sd x15, 72(x6)
-
-# Testcase 10:  rs1:x19(0xb5d97ef760ef1471), rs2:x28(0xac7c8803e01bbf50), result rd:x14(0x0000000000000000)
-li x19, MASK_XLEN(0xb5d97ef760ef1471)
-li x28, MASK_XLEN(0xac7c8803e01bbf50)
-SLT x14, x19, x28
-sd x14, 80(x6)
-
-# Testcase 11:  rs1:x19(0x66faf98908135d58), rs2:x14(0xb3ab1b2cdf26f517), result rd:x25(0x0000000000000000)
-li x19, MASK_XLEN(0x66faf98908135d58)
-li x14, MASK_XLEN(0xb3ab1b2cdf26f517)
-SLT x25, x19, x14
-sd x25, 88(x6)
-
-.EQU NUMTESTS,12
-
-RVTEST_CODE_END
-RVMODEL_HALT
-
-RVTEST_DATA_BEGIN
-.align 4
-rvtest_data:
-.word 0x98765432
-RVTEST_DATA_END
-
-RVMODEL_DATA_BEGIN
-
-
-wally_signature:
-    .fill NUMTESTS*(XLEN/32),4,0xdeadbeef
-
-#ifdef rvtest_mtrap_routine
-
-mtrap_sigptr:
-    .fill 64*(XLEN/32),4,0xdeadbeef
-
-#endif
-
-#ifdef rvtest_gpr_save
-
-gpr_save:
-    .fill 32*(XLEN/32),4,0xdeadbeef
-
-#endif
-sig_end_canary:
-.int 0x0
-rvtest_sig_end:
-
-RVMODEL_DATA_END
-// ../wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SLT.S
-// David_Harris@hmc.edu & Katherine Parry
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SLTU.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SLTU.S
deleted file mode 100644
index 0aec30e56..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SLTU.S
+++ /dev/null
@@ -1,142 +0,0 @@
-///////////////////////////////////////////
-// ../wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SLTU.S
-// David_Harris@hmc.edu & Katherine Parry
-// Created 2022-06-17 22:58:09.917963//
-// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, 
-// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software 
-// is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
-// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-///////////////////////////////////////////
-
-#include "model_test.h"
-#include "arch_test.h"
-RVTEST_ISA("RV64I")
-
-.section .text.init
-.globl rvtest_entry_point
-rvtest_entry_point:
-RVMODEL_BOOT
-RVTEST_CODE_BEGIN
-
-RVTEST_SIGBASE( x6, wally_signature)
-
-RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",sltu)
-
-# Testcase 0:  rs1:x22(0x0000000000000000), rs2:x23(0x0000000000000000), result rd:x2(0x0000000000000000)
-li x22, MASK_XLEN(0x0000000000000000)
-li x23, MASK_XLEN(0x0000000000000000)
-SLTU x2, x22, x23
-sd x2, 0(x6)
-
-# Testcase 1:  rs1:x15(0x0000000000000000), rs2:x17(0x0000000000000001), result rd:x29(0x0000000000000001)
-li x15, MASK_XLEN(0x0000000000000000)
-li x17, MASK_XLEN(0x0000000000000001)
-SLTU x29, x15, x17
-sd x29, 8(x6)
-
-# Testcase 2:  rs1:x16(0x0000000000000000), rs2:x30(0xffffffffffffffff), result rd:x18(0x0000000000000001)
-li x16, MASK_XLEN(0x0000000000000000)
-li x30, MASK_XLEN(0xffffffffffffffff)
-SLTU x18, x16, x30
-sd x18, 16(x6)
-
-# Testcase 3:  rs1:x20(0x0000000000000001), rs2:x25(0x0000000000000000), result rd:x1(0x0000000000000000)
-li x20, MASK_XLEN(0x0000000000000001)
-li x25, MASK_XLEN(0x0000000000000000)
-SLTU x1, x20, x25
-sd x1, 24(x6)
-
-# Testcase 4:  rs1:x29(0x0000000000000001), rs2:x2(0x0000000000000001), result rd:x16(0x0000000000000000)
-li x29, MASK_XLEN(0x0000000000000001)
-li x2, MASK_XLEN(0x0000000000000001)
-SLTU x16, x29, x2
-sd x16, 32(x6)
-
-# Testcase 5:  rs1:x11(0x0000000000000001), rs2:x10(0xffffffffffffffff), result rd:x27(0x0000000000000001)
-li x11, MASK_XLEN(0x0000000000000001)
-li x10, MASK_XLEN(0xffffffffffffffff)
-SLTU x27, x11, x10
-sd x27, 40(x6)
-
-# Testcase 6:  rs1:x15(0xffffffffffffffff), rs2:x2(0x0000000000000000), result rd:x26(0x0000000000000000)
-li x15, MASK_XLEN(0xffffffffffffffff)
-li x2, MASK_XLEN(0x0000000000000000)
-SLTU x26, x15, x2
-sd x26, 48(x6)
-
-# Testcase 7:  rs1:x27(0xffffffffffffffff), rs2:x29(0x0000000000000001), result rd:x26(0x0000000000000000)
-li x27, MASK_XLEN(0xffffffffffffffff)
-li x29, MASK_XLEN(0x0000000000000001)
-SLTU x26, x27, x29
-sd x26, 56(x6)
-
-# Testcase 8:  rs1:x14(0xffffffffffffffff), rs2:x7(0xffffffffffffffff), result rd:x18(0x0000000000000000)
-li x14, MASK_XLEN(0xffffffffffffffff)
-li x7, MASK_XLEN(0xffffffffffffffff)
-SLTU x18, x14, x7
-sd x18, 64(x6)
-
-# Testcase 9:  rs1:x3(0xf689a4a5ffda0336), rs2:x27(0xfa83ada4a2121ac5), result rd:x24(0x0000000000000001)
-li x3, MASK_XLEN(0xf689a4a5ffda0336)
-li x27, MASK_XLEN(0xfa83ada4a2121ac5)
-SLTU x24, x3, x27
-sd x24, 72(x6)
-
-# Testcase 10:  rs1:x31(0xfca055362169df82), rs2:x22(0x66dd779403c54c71), result rd:x14(0x0000000000000000)
-li x31, MASK_XLEN(0xfca055362169df82)
-li x22, MASK_XLEN(0x66dd779403c54c71)
-SLTU x14, x31, x22
-sd x14, 80(x6)
-
-# Testcase 11:  rs1:x23(0x00de59f550f0fc2b), rs2:x25(0x03a8987936a98d74), result rd:x1(0x0000000000000001)
-li x23, MASK_XLEN(0x00de59f550f0fc2b)
-li x25, MASK_XLEN(0x03a8987936a98d74)
-SLTU x1, x23, x25
-sd x1, 88(x6)
-
-.EQU NUMTESTS,12
-
-RVTEST_CODE_END
-RVMODEL_HALT
-
-RVTEST_DATA_BEGIN
-.align 4
-rvtest_data:
-.word 0x98765432
-RVTEST_DATA_END
-
-RVMODEL_DATA_BEGIN
-
-
-wally_signature:
-    .fill NUMTESTS*(XLEN/32),4,0xdeadbeef
-
-#ifdef rvtest_mtrap_routine
-
-mtrap_sigptr:
-    .fill 64*(XLEN/32),4,0xdeadbeef
-
-#endif
-
-#ifdef rvtest_gpr_save
-
-gpr_save:
-    .fill 32*(XLEN/32),4,0xdeadbeef
-
-#endif
-sig_end_canary:
-.int 0x0
-rvtest_sig_end:
-
-RVMODEL_DATA_END
-// ../wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SLTU.S
-// David_Harris@hmc.edu & Katherine Parry
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SUB.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SUB.S
deleted file mode 100644
index 1157c194c..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SUB.S
+++ /dev/null
@@ -1,142 +0,0 @@
-///////////////////////////////////////////
-// ../wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SUB.S
-// David_Harris@hmc.edu & Katherine Parry
-// Created 2022-06-17 22:58:09.915580//
-// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, 
-// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software 
-// is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
-// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-///////////////////////////////////////////
-
-#include "model_test.h"
-#include "arch_test.h"
-RVTEST_ISA("RV64I")
-
-.section .text.init
-.globl rvtest_entry_point
-rvtest_entry_point:
-RVMODEL_BOOT
-RVTEST_CODE_BEGIN
-
-RVTEST_SIGBASE( x6, wally_signature)
-
-RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",sub)
-
-# Testcase 0:  rs1:x4(0x0000000000000000), rs2:x23(0x0000000000000000), result rd:x13(0x0000000000000000)
-li x4, MASK_XLEN(0x0000000000000000)
-li x23, MASK_XLEN(0x0000000000000000)
-SUB x13, x4, x23
-sd x13, 0(x6)
-
-# Testcase 1:  rs1:x7(0x0000000000000000), rs2:x9(0x0000000000000001), result rd:x12(0xffffffffffffffff)
-li x7, MASK_XLEN(0x0000000000000000)
-li x9, MASK_XLEN(0x0000000000000001)
-SUB x12, x7, x9
-sd x12, 8(x6)
-
-# Testcase 2:  rs1:x29(0x0000000000000000), rs2:x24(0xffffffffffffffff), result rd:x16(0x0000000000000001)
-li x29, MASK_XLEN(0x0000000000000000)
-li x24, MASK_XLEN(0xffffffffffffffff)
-SUB x16, x29, x24
-sd x16, 16(x6)
-
-# Testcase 3:  rs1:x27(0x0000000000000001), rs2:x29(0x0000000000000000), result rd:x30(0x0000000000000001)
-li x27, MASK_XLEN(0x0000000000000001)
-li x29, MASK_XLEN(0x0000000000000000)
-SUB x30, x27, x29
-sd x30, 24(x6)
-
-# Testcase 4:  rs1:x22(0x0000000000000001), rs2:x7(0x0000000000000001), result rd:x31(0x0000000000000000)
-li x22, MASK_XLEN(0x0000000000000001)
-li x7, MASK_XLEN(0x0000000000000001)
-SUB x31, x22, x7
-sd x31, 32(x6)
-
-# Testcase 5:  rs1:x25(0x0000000000000001), rs2:x2(0xffffffffffffffff), result rd:x26(0x0000000000000002)
-li x25, MASK_XLEN(0x0000000000000001)
-li x2, MASK_XLEN(0xffffffffffffffff)
-SUB x26, x25, x2
-sd x26, 40(x6)
-
-# Testcase 6:  rs1:x9(0xffffffffffffffff), rs2:x4(0x0000000000000000), result rd:x20(0xffffffffffffffff)
-li x9, MASK_XLEN(0xffffffffffffffff)
-li x4, MASK_XLEN(0x0000000000000000)
-SUB x20, x9, x4
-sd x20, 48(x6)
-
-# Testcase 7:  rs1:x30(0xffffffffffffffff), rs2:x15(0x0000000000000001), result rd:x22(0xfffffffffffffffe)
-li x30, MASK_XLEN(0xffffffffffffffff)
-li x15, MASK_XLEN(0x0000000000000001)
-SUB x22, x30, x15
-sd x22, 56(x6)
-
-# Testcase 8:  rs1:x22(0xffffffffffffffff), rs2:x14(0xffffffffffffffff), result rd:x29(0x0000000000000000)
-li x22, MASK_XLEN(0xffffffffffffffff)
-li x14, MASK_XLEN(0xffffffffffffffff)
-SUB x29, x22, x14
-sd x29, 64(x6)
-
-# Testcase 9:  rs1:x10(0xdff3334b91b15f5d), rs2:x21(0xeae2025e82339e23), result rd:x12(0xf51130ed0f7dc13a)
-li x10, MASK_XLEN(0xdff3334b91b15f5d)
-li x21, MASK_XLEN(0xeae2025e82339e23)
-SUB x12, x10, x21
-sd x12, 72(x6)
-
-# Testcase 10:  rs1:x5(0xd670f668637e0edc), rs2:x18(0x403d1f83a859890c), result rd:x23(0x9633d6e4bb2485d0)
-li x5, MASK_XLEN(0xd670f668637e0edc)
-li x18, MASK_XLEN(0x403d1f83a859890c)
-SUB x23, x5, x18
-sd x23, 80(x6)
-
-# Testcase 11:  rs1:x11(0x753c7c99032f06ca), rs2:x24(0x143e2e04bdd7d19b), result rd:x2(0x60fe4e944557352f)
-li x11, MASK_XLEN(0x753c7c99032f06ca)
-li x24, MASK_XLEN(0x143e2e04bdd7d19b)
-SUB x2, x11, x24
-sd x2, 88(x6)
-
-.EQU NUMTESTS,12
-
-RVTEST_CODE_END
-RVMODEL_HALT
-
-RVTEST_DATA_BEGIN
-.align 4
-rvtest_data:
-.word 0x98765432
-RVTEST_DATA_END
-
-RVMODEL_DATA_BEGIN
-
-
-wally_signature:
-    .fill NUMTESTS*(XLEN/32),4,0xdeadbeef
-
-#ifdef rvtest_mtrap_routine
-
-mtrap_sigptr:
-    .fill 64*(XLEN/32),4,0xdeadbeef
-
-#endif
-
-#ifdef rvtest_gpr_save
-
-gpr_save:
-    .fill 32*(XLEN/32),4,0xdeadbeef
-
-#endif
-sig_end_canary:
-.int 0x0
-rvtest_sig_end:
-
-RVMODEL_DATA_END
-// ../wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-SUB.S
-// David_Harris@hmc.edu & Katherine Parry
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-XOR.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-XOR.S
deleted file mode 100644
index 949672e42..000000000
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-XOR.S
+++ /dev/null
@@ -1,142 +0,0 @@
-///////////////////////////////////////////
-// ../wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-XOR.S
-// David_Harris@hmc.edu & Katherine Parry
-// Created 2022-06-17 22:58:09.919138//
-// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, 
-// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software 
-// is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
-// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-///////////////////////////////////////////
-
-#include "model_test.h"
-#include "arch_test.h"
-RVTEST_ISA("RV64I")
-
-.section .text.init
-.globl rvtest_entry_point
-rvtest_entry_point:
-RVMODEL_BOOT
-RVTEST_CODE_BEGIN
-
-RVTEST_SIGBASE( x6, wally_signature)
-
-RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",xor)
-
-# Testcase 0:  rs1:x27(0x0000000000000000), rs2:x22(0x0000000000000000), result rd:x17(0x0000000000000000)
-li x27, MASK_XLEN(0x0000000000000000)
-li x22, MASK_XLEN(0x0000000000000000)
-XOR x17, x27, x22
-sd x17, 0(x6)
-
-# Testcase 1:  rs1:x20(0x0000000000000000), rs2:x4(0x0000000000000001), result rd:x7(0x0000000000000001)
-li x20, MASK_XLEN(0x0000000000000000)
-li x4, MASK_XLEN(0x0000000000000001)
-XOR x7, x20, x4
-sd x7, 8(x6)
-
-# Testcase 2:  rs1:x4(0x0000000000000000), rs2:x20(0xffffffffffffffff), result rd:x21(0xffffffffffffffff)
-li x4, MASK_XLEN(0x0000000000000000)
-li x20, MASK_XLEN(0xffffffffffffffff)
-XOR x21, x4, x20
-sd x21, 16(x6)
-
-# Testcase 3:  rs1:x7(0x0000000000000001), rs2:x28(0x0000000000000000), result rd:x10(0x0000000000000001)
-li x7, MASK_XLEN(0x0000000000000001)
-li x28, MASK_XLEN(0x0000000000000000)
-XOR x10, x7, x28
-sd x10, 24(x6)
-
-# Testcase 4:  rs1:x4(0x0000000000000001), rs2:x16(0x0000000000000001), result rd:x28(0x0000000000000000)
-li x4, MASK_XLEN(0x0000000000000001)
-li x16, MASK_XLEN(0x0000000000000001)
-XOR x28, x4, x16
-sd x28, 32(x6)
-
-# Testcase 5:  rs1:x30(0x0000000000000001), rs2:x13(0xffffffffffffffff), result rd:x21(0xfffffffffffffffe)
-li x30, MASK_XLEN(0x0000000000000001)
-li x13, MASK_XLEN(0xffffffffffffffff)
-XOR x21, x30, x13
-sd x21, 40(x6)
-
-# Testcase 6:  rs1:x3(0xffffffffffffffff), rs2:x1(0x0000000000000000), result rd:x9(0xffffffffffffffff)
-li x3, MASK_XLEN(0xffffffffffffffff)
-li x1, MASK_XLEN(0x0000000000000000)
-XOR x9, x3, x1
-sd x9, 48(x6)
-
-# Testcase 7:  rs1:x30(0xffffffffffffffff), rs2:x15(0x0000000000000001), result rd:x26(0xfffffffffffffffe)
-li x30, MASK_XLEN(0xffffffffffffffff)
-li x15, MASK_XLEN(0x0000000000000001)
-XOR x26, x30, x15
-sd x26, 56(x6)
-
-# Testcase 8:  rs1:x26(0xffffffffffffffff), rs2:x4(0xffffffffffffffff), result rd:x28(0x0000000000000000)
-li x26, MASK_XLEN(0xffffffffffffffff)
-li x4, MASK_XLEN(0xffffffffffffffff)
-XOR x28, x26, x4
-sd x28, 64(x6)
-
-# Testcase 9:  rs1:x27(0x2227d96d41a93f90), rs2:x21(0x8557716aa7502a81), result rd:x21(0xa770a807e6f91511)
-li x27, MASK_XLEN(0x2227d96d41a93f90)
-li x21, MASK_XLEN(0x8557716aa7502a81)
-XOR x21, x27, x21
-sd x21, 72(x6)
-
-# Testcase 10:  rs1:x9(0x1d77ce4058d87776), rs2:x28(0x27896389df3277fd), result rd:x1(0x3afeadc987ea008b)
-li x9, MASK_XLEN(0x1d77ce4058d87776)
-li x28, MASK_XLEN(0x27896389df3277fd)
-XOR x1, x9, x28
-sd x1, 80(x6)
-
-# Testcase 11:  rs1:x9(0x0a68e88e0ad40415), rs2:x18(0xae55cdff34ab18fd), result rd:x11(0xa43d25713e7f1ce8)
-li x9, MASK_XLEN(0x0a68e88e0ad40415)
-li x18, MASK_XLEN(0xae55cdff34ab18fd)
-XOR x11, x9, x18
-sd x11, 88(x6)
-
-.EQU NUMTESTS,12
-
-RVTEST_CODE_END
-RVMODEL_HALT
-
-RVTEST_DATA_BEGIN
-.align 4
-rvtest_data:
-.word 0x98765432
-RVTEST_DATA_END
-
-RVMODEL_DATA_BEGIN
-
-
-wally_signature:
-    .fill NUMTESTS*(XLEN/32),4,0xdeadbeef
-
-#ifdef rvtest_mtrap_routine
-
-mtrap_sigptr:
-    .fill 64*(XLEN/32),4,0xdeadbeef
-
-#endif
-
-#ifdef rvtest_gpr_save
-
-gpr_save:
-    .fill 32*(XLEN/32),4,0xdeadbeef
-
-#endif
-sig_end_canary:
-.int 0x0
-rvtest_sig_end:
-
-RVMODEL_DATA_END
-// ../wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/src/WALLY-XOR.S
-// David_Harris@hmc.edu & Katherine Parry