diff --git a/sim/wave-fpu copy.do b/sim/wave-fpu copy.do
new file mode 100644
index 000000000..a1cfa8731
--- /dev/null
+++ b/sim/wave-fpu copy.do	
@@ -0,0 +1,29 @@
+
+add wave -noupdate /testbenchfp/clk
+add wave -noupdate -radix decimal /testbenchfp/VectorNum
+add wave -noupdate /testbenchfp/FrmNum
+add wave -noupdate /testbenchfp/X
+add wave -noupdate /testbenchfp/Y
+add wave -noupdate /testbenchfp/Z
+add wave -noupdate /testbenchfp/Res
+add wave -noupdate /testbenchfp/Ans
+add wave -noupdate /testbenchfp/DivStart
+add wave -noupdate /testbenchfp/FDivBusyE
+add wave -noupdate /testbenchfp/CheckNow
+add wave -noupdate /testbenchfp/DivDone
+add wave -noupdate /testbenchfp/ResMatch
+add wave -noupdate /testbenchfp/FlagMatch
+add wave -noupdate /testbenchfp/CheckNow
+add wave -noupdate /testbenchfp/NaNGood
+add wave -group {PostProc} -noupdate /testbenchfp/postprocess/*
+add wave -group {PostProc} -noupdate /testbenchfp/postprocess/specialcase/*
+add wave -group {PostProc} -noupdate /testbenchfp/postprocess/flags/*
+add wave -group {PostProc} -noupdate /testbenchfp/postprocess/normshift/*
+add wave -group {PostProc} -noupdate /testbenchfp/postprocess/shiftcorrection/*
+add wave -group {PostProc} -noupdate /testbenchfp/postprocess/resultsign/*
+add wave -group {PostProc} -noupdate /testbenchfp/postprocess/round/*
+add wave -group {PostProc} -noupdate /testbenchfp/postprocess/fmashiftcalc/*
+add wave -group {PostProc} -noupdate /testbenchfp/postprocess/divshiftcalc/*
+add wave -group {PostProc} -noupdate /testbenchfp/postprocess/cvtshiftcalc/*
+add wave -group {Testbench} -noupdate /testbenchfp/*
+add wave -group {Testbench} -noupdate /testbenchfp/readvectors/*
diff --git a/sim/wave-fpu.do b/sim/wave-fpu.do
index a1cfa8731..85eccac27 100644
--- a/sim/wave-fpu.do
+++ b/sim/wave-fpu.do
@@ -15,15 +15,6 @@ add wave -noupdate /testbenchfp/ResMatch
 add wave -noupdate /testbenchfp/FlagMatch
 add wave -noupdate /testbenchfp/CheckNow
 add wave -noupdate /testbenchfp/NaNGood
-add wave -group {PostProc} -noupdate /testbenchfp/postprocess/*
-add wave -group {PostProc} -noupdate /testbenchfp/postprocess/specialcase/*
-add wave -group {PostProc} -noupdate /testbenchfp/postprocess/flags/*
-add wave -group {PostProc} -noupdate /testbenchfp/postprocess/normshift/*
-add wave -group {PostProc} -noupdate /testbenchfp/postprocess/shiftcorrection/*
-add wave -group {PostProc} -noupdate /testbenchfp/postprocess/resultsign/*
-add wave -group {PostProc} -noupdate /testbenchfp/postprocess/round/*
-add wave -group {PostProc} -noupdate /testbenchfp/postprocess/fmashiftcalc/*
-add wave -group {PostProc} -noupdate /testbenchfp/postprocess/divshiftcalc/*
-add wave -group {PostProc} -noupdate /testbenchfp/postprocess/cvtshiftcalc/*
+
 add wave -group {Testbench} -noupdate /testbenchfp/*
 add wave -group {Testbench} -noupdate /testbenchfp/readvectors/*
diff --git a/testbench/testbench-fp.sv b/testbench/testbench-fp.sv
index a12fbd883..a485a9f5d 100644
--- a/testbench/testbench-fp.sv
+++ b/testbench/testbench-fp.sv
@@ -658,9 +658,9 @@ module testbenchfp;
             Fmt = {Fmt, 2'b10};
         end
       end
-      if (TEST === "custom") begin // if unified div sqrt is being tested
+      if (TEST === "customdiv") begin // if unified div sqrt is being tested
         Tests = {Tests, custom};
-        OpCtrl = {OpCtrl, `SQRT_OPCTRL};
+        OpCtrl = {OpCtrl, `DIV_OPCTRL};
         WriteInt = {WriteInt, 1'b0};
         Unit = {Unit, `DIVUNIT};
         Fmt = {Fmt, 2'b10};
@@ -782,7 +782,7 @@ module testbenchfp;
 			     .Funct3E(Funct3E), .IntDivE(1'b0), .FIntDivResultM(FIntDivResultM),
 			     .FDivDoneE(FDivDoneE), .IFDivStartE(IFDivStartE));
    end
-   if (TEST === "divremsqrt" | TEST === "divremsqrttest") begin: divremsqrt
+   if (TEST === "divremsqrt" | TEST === "divremsqrttest" | TEST === "customdiv") begin: divremsqrt
     drsu #(P) drsu(.clk, .reset, .XsE(Xs), .YsE(Ys), .FmtE(ModFmt), .XmE(Xm), .YmE(Ym), 
 		       .XeE(Xe), .YeE(Ye), .SqrtE(OpCtrlVal[0]), .SqrtM(OpCtrlVal[0]),
            .XInfE(XInf), .YInfE(YInf), .XZeroE(XZero), .YZeroE(YZero), 
diff --git a/testbench/tests-fp.vh b/testbench/tests-fp.vh
index e32da9d29..3c7e0cbf9 100644
--- a/testbench/tests-fp.vh
+++ b/testbench/tests-fp.vh
@@ -582,7 +582,7 @@ string f128fma[] = '{
 };
 
 string custom[] = '{
-	"f16_sqrt_rne.tv"
+	"f16_div_rne.tv"
 };