diff --git a/addins/riscv-arch-test b/addins/riscv-arch-test
index 307c77b26..ad04e119a 160000
--- a/addins/riscv-arch-test
+++ b/addins/riscv-arch-test
@@ -1 +1 @@
-Subproject commit 307c77b26e070ae85ffea665ad9b642b40e33c86
+Subproject commit ad04e119a5d846a1c11159786ad3382cf5ad3649
diff --git a/pipelined/src/fpu/fpu.sv b/pipelined/src/fpu/fpu.sv
index 571539c25..383b6200b 100755
--- a/pipelined/src/fpu/fpu.sv
+++ b/pipelined/src/fpu/fpu.sv
@@ -233,7 +233,6 @@ module fpu (
 
    // select the result that may be written to the integer register - to IEU
    mux4  #(`XLEN)  IntResMux(CmpResE[`XLEN-1:0], FSrcXE[`XLEN-1:0], ClassResE[`XLEN-1:0], 
-               CvtResE[`XLEN-1:0], FIntResSelE, FIntResE);
                CvtIntResE, FIntResSelE, FIntResE);
    // *** DH 5/25/22: CvtRes will move to mem stage.  Premux in execute to save area, then make sure stalls are ok
    // *** make sure the fpu matches the chapter diagram
diff --git a/pipelined/testbench/tests-fp.vh b/pipelined/testbench/tests-fp.vh
index 15abb6525..3db466c9a 100644
--- a/pipelined/testbench/tests-fp.vh
+++ b/pipelined/testbench/tests-fp.vh
@@ -1,29 +1,3 @@
-///////////////////////////////////////////
-// tests.vh
-//
-// Written: David_Harris@hmc.edu 7 October 2021
-// Modified: 
-//
-// Purpose: List of tests to apply
-// 
-// A component of the Wally configurable RISC-V project.
-// 
-// 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.
-///////////////////////////////////////////
-
-
 `define PATH "../../tests/fp/vectors/"
 `define ADD_OPCTRL 3'b110
 `define MUL_OPCTRL 3'b100