diff --git a/unittests/ASM/X87/DA_02.asm b/unittests/ASM/X87/DA_02.asm
index 9d5672f04..d6d91e02c 100644
--- a/unittests/ASM/X87/DA_02.asm
+++ b/unittests/ASM/X87/DA_02.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RSI":  ["0x18"]
+    "RSI":  "0x18"
   }
 }
 %endif
diff --git a/unittests/ASM/X87/DE_02.asm b/unittests/ASM/X87/DE_02.asm
index fdc0d0e1b..3cf0cbc82 100644
--- a/unittests/ASM/X87/DE_02.asm
+++ b/unittests/ASM/X87/DE_02.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RSI":  ["0x18"]
+    "RSI":  "0x18"
   }
 }
 %endif
diff --git a/unittests/ASM/X87_F64/D8_00_F64.asm b/unittests/ASM/X87_F64/D8_00_F64.asm
index cc517169c..dca4dec67 100644
--- a/unittests/ASM/X87_F64/D8_00_F64.asm
+++ b/unittests/ASM/X87_F64/D8_00_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4008000000000000"]
+    "RAX":  "0x4008000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D8_01_F64.asm b/unittests/ASM/X87_F64/D8_01_F64.asm
index 3faef6731..594d0aefd 100644
--- a/unittests/ASM/X87_F64/D8_01_F64.asm
+++ b/unittests/ASM/X87_F64/D8_01_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4000000000000000"]
+    "RAX":  "0x4000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D8_04_F64.asm b/unittests/ASM/X87_F64/D8_04_F64.asm
index 94c27783b..932e4f767 100644
--- a/unittests/ASM/X87_F64/D8_04_F64.asm
+++ b/unittests/ASM/X87_F64/D8_04_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0xbff0000000000000"]
+    "RAX":  "0xbff0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D8_05_F64.asm b/unittests/ASM/X87_F64/D8_05_F64.asm
index 7ec49aab9..a6e2554af 100644
--- a/unittests/ASM/X87_F64/D8_05_F64.asm
+++ b/unittests/ASM/X87_F64/D8_05_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"]
+    "RAX":  "0x3ff0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D8_06_F64.asm b/unittests/ASM/X87_F64/D8_06_F64.asm
index 0d135733a..2625732c3 100644
--- a/unittests/ASM/X87_F64/D8_06_F64.asm
+++ b/unittests/ASM/X87_F64/D8_06_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3fe0000000000000"]
+    "RAX":  "0x3fe0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D8_C8_F64.asm b/unittests/ASM/X87_F64/D8_C8_F64.asm
index 5daef2342..88ee9bbfc 100644
--- a/unittests/ASM/X87_F64/D8_C8_F64.asm
+++ b/unittests/ASM/X87_F64/D8_C8_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4010000000000000"]
+    "RAX":  "0x4010000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D8_D9_F64.asm b/unittests/ASM/X87_F64/D8_D9_F64.asm
index 23414cbae..5de716e8e 100644
--- a/unittests/ASM/X87_F64/D8_D9_F64.asm
+++ b/unittests/ASM/X87_F64/D8_D9_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"],
-    "RBX":  ["0x3ff0000000000000"]
+    "RAX":  "0x3ff0000000000000",
+    "RBX":  "0x3ff0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_C8_F64.asm b/unittests/ASM/X87_F64/D9_C8_F64.asm
index 4613766f4..b421694c3 100644
--- a/unittests/ASM/X87_F64/D9_C8_F64.asm
+++ b/unittests/ASM/X87_F64/D9_C8_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"],
-    "RBX":  ["0x4000000000000000"]
+    "RAX":  "0x3ff0000000000000",
+    "RBX":  "0x4000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_E0_F64.asm b/unittests/ASM/X87_F64/D9_E0_F64.asm
index ef2286c71..2c5ebaed6 100644
--- a/unittests/ASM/X87_F64/D9_E0_F64.asm
+++ b/unittests/ASM/X87_F64/D9_E0_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"],
-    "RBX":  ["0xc000000000000000"]
+    "RAX":  "0x3ff0000000000000",
+    "RBX":  "0xc000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_E1_F64.asm b/unittests/ASM/X87_F64/D9_E1_F64.asm
index 2f8b0906b..d9e083a46 100644
--- a/unittests/ASM/X87_F64/D9_E1_F64.asm
+++ b/unittests/ASM/X87_F64/D9_E1_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"],
-    "RBX":  ["0x4000000000000000"]
+    "RAX":  "0x3ff0000000000000",
+    "RBX":  "0x4000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_E8_F64.asm b/unittests/ASM/X87_F64/D9_E8_F64.asm
index a27149a4e..004099fff 100644
--- a/unittests/ASM/X87_F64/D9_E8_F64.asm
+++ b/unittests/ASM/X87_F64/D9_E8_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"]
+    "RAX":  "0x3ff0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_E9_F64.asm b/unittests/ASM/X87_F64/D9_E9_F64.asm
index 11a1ff3d4..3ba841467 100644
--- a/unittests/ASM/X87_F64/D9_E9_F64.asm
+++ b/unittests/ASM/X87_F64/D9_E9_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x40549a78"]
+    "RAX":  "0x40549a78"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_EA_F64.asm b/unittests/ASM/X87_F64/D9_EA_F64.asm
index 52c4c28f6..3f20e7a30 100644
--- a/unittests/ASM/X87_F64/D9_EA_F64.asm
+++ b/unittests/ASM/X87_F64/D9_EA_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3fb8aa3b"]
+    "RAX":  "0x3fb8aa3b"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_EB_F64.asm b/unittests/ASM/X87_F64/D9_EB_F64.asm
index a667fa4d2..0475d6f6b 100644
--- a/unittests/ASM/X87_F64/D9_EB_F64.asm
+++ b/unittests/ASM/X87_F64/D9_EB_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x40490fdb"]
+    "RAX":  "0x40490fdb"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_EC_F64.asm b/unittests/ASM/X87_F64/D9_EC_F64.asm
index 69aca1a97..c11e17d1a 100644
--- a/unittests/ASM/X87_F64/D9_EC_F64.asm
+++ b/unittests/ASM/X87_F64/D9_EC_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3e9a209b"]
+    "RAX":  "0x3e9a209b"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_ED_F64.asm b/unittests/ASM/X87_F64/D9_ED_F64.asm
index 13e3dba2c..4b4fca0dc 100644
--- a/unittests/ASM/X87_F64/D9_ED_F64.asm
+++ b/unittests/ASM/X87_F64/D9_ED_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3f317218"]
+    "RAX":  "0x3f317218"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_F0_F64.asm b/unittests/ASM/X87_F64/D9_F0_F64.asm
index 7170e398b..f150e77fa 100644
--- a/unittests/ASM/X87_F64/D9_F0_F64.asm
+++ b/unittests/ASM/X87_F64/D9_F0_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x0"]
+    "RAX":  "0x0"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_F1_F64.asm b/unittests/ASM/X87_F64/D9_F1_F64.asm
index aa22954ed..800f506a5 100644
--- a/unittests/ASM/X87_F64/D9_F1_F64.asm
+++ b/unittests/ASM/X87_F64/D9_F1_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"],
-    "RBX":  ["0x4020000000000000"]
+    "RAX":  "0x3ff0000000000000",
+    "RBX":  "0x4020000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_F2_F64.asm b/unittests/ASM/X87_F64/D9_F2_F64.asm
index 6df87b522..4d15febd7 100644
--- a/unittests/ASM/X87_F64/D9_F2_F64.asm
+++ b/unittests/ASM/X87_F64/D9_F2_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"]
+    "RAX":  "0x3ff0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_F3_F64.asm b/unittests/ASM/X87_F64/D9_F3_F64.asm
index f5a976303..7fa61a488 100644
--- a/unittests/ASM/X87_F64/D9_F3_F64.asm
+++ b/unittests/ASM/X87_F64/D9_F3_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"],
-    "RBX":  ["0x3ff921fb54442d18"]
+    "RAX":  "0x3ff0000000000000",
+    "RBX":  "0x3ff921fb54442d18"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_F4_F64.asm b/unittests/ASM/X87_F64/D9_F4_F64.asm
index eb7a11810..47da9e56d 100644
--- a/unittests/ASM/X87_F64/D9_F4_F64.asm
+++ b/unittests/ASM/X87_F64/D9_F4_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0xbffe000000000000"],
-    "RBX":  ["0x4008000000000000"]
+    "RAX":  "0xbffe000000000000",
+    "RBX":  "0x4008000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_F5_F64.asm b/unittests/ASM/X87_F64/D9_F5_F64.asm
index f1dab30b3..3c18b80ae 100644
--- a/unittests/ASM/X87_F64/D9_F5_F64.asm
+++ b/unittests/ASM/X87_F64/D9_F5_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0xbf666666"],
-    "RBX":  ["0x40400000"]
+    "RAX":  "0xbf666666",
+    "RBX":  "0x40400000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_FA_F64.asm b/unittests/ASM/X87_F64/D9_FA_F64.asm
index f91ead03d..06db5cd1d 100644
--- a/unittests/ASM/X87_F64/D9_FA_F64.asm
+++ b/unittests/ASM/X87_F64/D9_FA_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4010000000000000"]
+    "RAX":  "0x4010000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_FB_F64.asm b/unittests/ASM/X87_F64/D9_FB_F64.asm
index 8fb3c5104..7db263d12 100644
--- a/unittests/ASM/X87_F64/D9_FB_F64.asm
+++ b/unittests/ASM/X87_F64/D9_FB_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3fe14a280fb5068c"],
-    "RBX":  ["0x3feaed548f090cee"]
+    "RAX":  "0x3fe14a280fb5068c",
+    "RBX":  "0x3feaed548f090cee"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_FC_F64.asm b/unittests/ASM/X87_F64/D9_FC_F64.asm
index 827211bcc..d44fb4587 100644
--- a/unittests/ASM/X87_F64/D9_FC_F64.asm
+++ b/unittests/ASM/X87_F64/D9_FC_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"]
+    "RAX":  "0x3ff0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_FD_F64.asm b/unittests/ASM/X87_F64/D9_FD_F64.asm
index 46f4bebf2..05e6763db 100644
--- a/unittests/ASM/X87_F64/D9_FD_F64.asm
+++ b/unittests/ASM/X87_F64/D9_FD_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x43000000"],
-    "RBX":  ["0x40b00000"]
+    "RAX":  "0x43000000",
+    "RBX":  "0x40b00000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_FE_F64.asm b/unittests/ASM/X87_F64/D9_FE_F64.asm
index 09478acd7..4b1aca891 100644
--- a/unittests/ASM/X87_F64/D9_FE_F64.asm
+++ b/unittests/ASM/X87_F64/D9_FE_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3feaed548f090cee"]
+    "RAX":  "0x3feaed548f090cee"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/D9_FF_F64.asm b/unittests/ASM/X87_F64/D9_FF_F64.asm
index b95d66f20..143d16642 100644
--- a/unittests/ASM/X87_F64/D9_FF_F64.asm
+++ b/unittests/ASM/X87_F64/D9_FF_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0xbfdaa22657537205"]
+    "RAX":  "0xbfdaa22657537205"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DA_01_F64.asm b/unittests/ASM/X87_F64/DA_01_F64.asm
index 8cf8beeff..5fa44835d 100644
--- a/unittests/ASM/X87_F64/DA_01_F64.asm
+++ b/unittests/ASM/X87_F64/DA_01_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0x4000000000000000"],
-    "RSI":  ["0xC000000000000000"]
+    "RCX":  "0x4000000000000000",
+    "RSI":  "0xC000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DA_02_F64.asm b/unittests/ASM/X87_F64/DA_02_F64.asm
index 713446284..8fbdcfa3e 100644
--- a/unittests/ASM/X87_F64/DA_02_F64.asm
+++ b/unittests/ASM/X87_F64/DA_02_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RSI":  ["0x18"]
+    "RSI":  "0x18"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DA_04_F64.asm b/unittests/ASM/X87_F64/DA_04_F64.asm
index b34e1dbe0..be63d7d04 100644
--- a/unittests/ASM/X87_F64/DA_04_F64.asm
+++ b/unittests/ASM/X87_F64/DA_04_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0xbff0000000000000"],
-    "RSI":  ["0x4008000000000000"]
+    "RCX":  "0xbff0000000000000",
+    "RSI":  "0x4008000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DA_05_F64.asm b/unittests/ASM/X87_F64/DA_05_F64.asm
index 678673dfe..e091890e1 100644
--- a/unittests/ASM/X87_F64/DA_05_F64.asm
+++ b/unittests/ASM/X87_F64/DA_05_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0x3ff0000000000000"],
-    "RSI":  ["0xc008000000000000"]
+    "RCX":  "0x3ff0000000000000",
+    "RSI":  "0xc008000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DA_06_F64.asm b/unittests/ASM/X87_F64/DA_06_F64.asm
index 42602f6df..8c9c7cbe0 100644
--- a/unittests/ASM/X87_F64/DA_06_F64.asm
+++ b/unittests/ASM/X87_F64/DA_06_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0x3fe0000000000000"],
-    "RSI":  ["0xbfe0000000000000"]
+    "RCX":  "0x3fe0000000000000",
+    "RSI":  "0xbfe0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DA_07_F64.asm b/unittests/ASM/X87_F64/DA_07_F64.asm
index 1ccdd976c..3ebb158c6 100644
--- a/unittests/ASM/X87_F64/DA_07_F64.asm
+++ b/unittests/ASM/X87_F64/DA_07_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0x4000000000000000"],
-    "RSI":  ["0xc000000000000000"]
+    "RCX":  "0x4000000000000000",
+    "RSI":  "0xc000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DA_D9_F64.asm b/unittests/ASM/X87_F64/DA_D9_F64.asm
index bdd4bcb1f..2705e4d9d 100644
--- a/unittests/ASM/X87_F64/DA_D9_F64.asm
+++ b/unittests/ASM/X87_F64/DA_D9_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x3ff0000000000000"],
-    "RBX":  ["0x3ff0000000000000"]
+    "RAX":  "0x3ff0000000000000",
+    "RBX":  "0x3ff0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DC_07_F64.asm b/unittests/ASM/X87_F64/DC_07_F64.asm
index 941f7583d..d40131f90 100644
--- a/unittests/ASM/X87_F64/DC_07_F64.asm
+++ b/unittests/ASM/X87_F64/DC_07_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4010000000000000"]
+    "RAX":  "0x4010000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_00_F64.asm b/unittests/ASM/X87_F64/DE_00_F64.asm
index 120fe80fe..7b6514c92 100644
--- a/unittests/ASM/X87_F64/DE_00_F64.asm
+++ b/unittests/ASM/X87_F64/DE_00_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0x4008000000000000"],
-    "RSI":  ["0xbff0000000000000"]
+    "RCX":  "0x4008000000000000",
+    "RSI":  "0xbff0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_01_F64.asm b/unittests/ASM/X87_F64/DE_01_F64.asm
index 20f85962d..b8caf7c19 100644
--- a/unittests/ASM/X87_F64/DE_01_F64.asm
+++ b/unittests/ASM/X87_F64/DE_01_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0x4000000000000000"],
-    "RSI":  ["0xC000000000000000"]
+    "RCX":  "0x4000000000000000",
+    "RSI":  "0xC000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_02_F64.asm b/unittests/ASM/X87_F64/DE_02_F64.asm
index 1fcbcca39..8d3d97445 100644
--- a/unittests/ASM/X87_F64/DE_02_F64.asm
+++ b/unittests/ASM/X87_F64/DE_02_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RSI":  ["0x18"]
+    "RSI":  "0x18"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_04_F64.asm b/unittests/ASM/X87_F64/DE_04_F64.asm
index ab58c6481..7dc4dd272 100644
--- a/unittests/ASM/X87_F64/DE_04_F64.asm
+++ b/unittests/ASM/X87_F64/DE_04_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0xbff0000000000000"],
-    "RSI":  ["0x4008000000000000"]
+    "RCX":  "0xbff0000000000000",
+    "RSI":  "0x4008000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_05_F64.asm b/unittests/ASM/X87_F64/DE_05_F64.asm
index 1dd38c686..1f5c94960 100644
--- a/unittests/ASM/X87_F64/DE_05_F64.asm
+++ b/unittests/ASM/X87_F64/DE_05_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0x3ff0000000000000"],
-    "RSI":  ["0xc008000000000000"]
+    "RCX":  "0x3ff0000000000000",
+    "RSI":  "0xc008000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_06_F64.asm b/unittests/ASM/X87_F64/DE_06_F64.asm
index 748abd111..c92d60370 100644
--- a/unittests/ASM/X87_F64/DE_06_F64.asm
+++ b/unittests/ASM/X87_F64/DE_06_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0x3fe0000000000000"],
-    "RSI":  ["0xbfe0000000000000"]
+    "RCX":  "0x3fe0000000000000",
+    "RSI":  "0xbfe0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_07_F64.asm b/unittests/ASM/X87_F64/DE_07_F64.asm
index 257f5ecc8..dc08f38d7 100644
--- a/unittests/ASM/X87_F64/DE_07_F64.asm
+++ b/unittests/ASM/X87_F64/DE_07_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RCX":  ["0x4000000000000000"],
-    "RSI":  ["0xc000000000000000"]
+    "RCX":  "0x4000000000000000",
+    "RSI":  "0xc000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_C0_F64.asm b/unittests/ASM/X87_F64/DE_C0_F64.asm
index 01b747566..fd2d9f554 100644
--- a/unittests/ASM/X87_F64/DE_C0_F64.asm
+++ b/unittests/ASM/X87_F64/DE_C0_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4010000000000000"],
-    "RBX":  ["0x4008000000000000"]
+    "RAX":  "0x4010000000000000",
+    "RBX":  "0x4008000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_C8_F64.asm b/unittests/ASM/X87_F64/DE_C8_F64.asm
index 976917419..bf501bc69 100644
--- a/unittests/ASM/X87_F64/DE_C8_F64.asm
+++ b/unittests/ASM/X87_F64/DE_C8_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4010000000000000"],
-    "RBX":  ["0x4020000000000000"]
+    "RAX":  "0x4010000000000000",
+    "RBX":  "0x4020000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_E0_F64.asm b/unittests/ASM/X87_F64/DE_E0_F64.asm
index 3885fd882..df3687a3e 100644
--- a/unittests/ASM/X87_F64/DE_E0_F64.asm
+++ b/unittests/ASM/X87_F64/DE_E0_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4010000000000000"],
-    "RBX":  ["0x4000000000000000"]
+    "RAX":  "0x4010000000000000",
+    "RBX":  "0x4000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_E8_F64.asm b/unittests/ASM/X87_F64/DE_E8_F64.asm
index 24791689a..faeec08e4 100644
--- a/unittests/ASM/X87_F64/DE_E8_F64.asm
+++ b/unittests/ASM/X87_F64/DE_E8_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4010000000000000"],
-    "RBX":  ["0xc000000000000000"]
+    "RAX":  "0x4010000000000000",
+    "RBX":  "0xc000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_F0_F64.asm b/unittests/ASM/X87_F64/DE_F0_F64.asm
index c7c62e394..75feb713e 100644
--- a/unittests/ASM/X87_F64/DE_F0_F64.asm
+++ b/unittests/ASM/X87_F64/DE_F0_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4010000000000000"],
-    "RBX":  ["0x4000000000000000"]
+    "RAX":  "0x4010000000000000",
+    "RBX":  "0x4000000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/DE_F8_F64.asm b/unittests/ASM/X87_F64/DE_F8_F64.asm
index eac062a3f..67cd9e47b 100644
--- a/unittests/ASM/X87_F64/DE_F8_F64.asm
+++ b/unittests/ASM/X87_F64/DE_F8_F64.asm
@@ -1,8 +1,8 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x4010000000000000"],
-    "RBX":  ["0x3fe0000000000000"]
+    "RAX":  "0x4010000000000000",
+    "RBX":  "0x3fe0000000000000"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }
diff --git a/unittests/ASM/X87_F64/FCOM_F64.asm b/unittests/ASM/X87_F64/FCOM_F64.asm
index e0c230a7b..64a96390b 100644
--- a/unittests/ASM/X87_F64/FCOM_F64.asm
+++ b/unittests/ASM/X87_F64/FCOM_F64.asm
@@ -1,7 +1,7 @@
 %ifdef CONFIG
 {
   "RegData": {
-    "RAX":  ["0x0"]
+    "RAX":  "0x0"
   },
   "Env": { "FEX_X87REDUCEDPRECISION" : "1" }
 }