diff --git a/X86DisassemblerTests/TestData/fstsw_tests.csv b/X86DisassemblerTests/TestData/fstsw_tests.csv
index 859fb64..eb41565 100644
--- a/X86DisassemblerTests/TestData/fstsw_tests.csv
+++ b/X86DisassemblerTests/TestData/fstsw_tests.csv
@@ -9,30 +9,30 @@ DFE0;[{ "Type": "Fnstsw", "Operands": ["ax"] }]
 9BDFE0;[{ "Type": "Fstsw", "Operands": ["ax"] }]
 
 # FSTSW m2byte - Store FPU status word to memory
-9BDD3C25;[{ "Type": "Fstsw", "Operands": ["word ptr [eax]"] }]
+9BDD38;[{ "Type": "Fstsw", "Operands": ["word ptr [eax]"] }]
 9BDD3C24;[{ "Type": "Fstsw", "Operands": ["word ptr [esp]"] }]
-9BDD3C2C;[{ "Type": "Fstsw", "Operands": ["word ptr [esp]"] }]
-9BDD3C23;[{ "Type": "Fstsw", "Operands": ["word ptr [ebx]"] }]
-9BDD3C21;[{ "Type": "Fstsw", "Operands": ["word ptr [ecx]"] }]
-9BDD3C22;[{ "Type": "Fstsw", "Operands": ["word ptr [edx]"] }]
-9BDD3C26;[{ "Type": "Fstsw", "Operands": ["word ptr [esi]"] }]
-9BDD3C27;[{ "Type": "Fstsw", "Operands": ["word ptr [edi]"] }]
+9BDD7C24;[{ "Type": "Fstsw", "Operands": ["word ptr [esp]"] }]
+9BDD3B;[{ "Type": "Fstsw", "Operands": ["word ptr [ebx]"] }]
+9BDD39;[{ "Type": "Fstsw", "Operands": ["word ptr [ecx]"] }]
+9BDD3A;[{ "Type": "Fstsw", "Operands": ["word ptr [edx]"] }]
+9BDD3E;[{ "Type": "Fstsw", "Operands": ["word ptr [esi]"] }]
+9BDD3F;[{ "Type": "Fstsw", "Operands": ["word ptr [edi]"] }]
 
 # FNSTSW m2byte - Store FPU status word to memory without checking for pending unmasked exceptions
-DD3C25;[{ "Type": "Fnstsw", "Operands": ["word ptr [eax]"] }]
-DD3C24;[{ "Type": "Fnstsw", "Operands": ["word ptr [esp]"] }]
-DD3C2C;[{ "Type": "Fnstsw", "Operands": ["word ptr [esp]"] }]
-DD3C23;[{ "Type": "Fnstsw", "Operands": ["word ptr [ebx]"] }]
-DD3C21;[{ "Type": "Fnstsw", "Operands": ["word ptr [ecx]"] }]
-DD3C22;[{ "Type": "Fnstsw", "Operands": ["word ptr [edx]"] }]
-DD3C26;[{ "Type": "Fnstsw", "Operands": ["word ptr [esi]"] }]
-DD3C27;[{ "Type": "Fnstsw", "Operands": ["word ptr [edi]"] }]
+DD38;[{ "Type": "Fnstsw", "Operands": ["word ptr [eax]"] }]
+DD3C24;[{ "Type": "Fnstsw", "Operands": ["word ptr [esp+0x00]"] }]
+DD7C24;[{ "Type": "Fnstsw", "Operands": ["word ptr [esp+0x00]"] }]
+DD3B;[{ "Type": "Fnstsw", "Operands": ["word ptr [ebx]"] }]
+DD39;[{ "Type": "Fnstsw", "Operands": ["word ptr [ecx]"] }]
+DD3A;[{ "Type": "Fnstsw", "Operands": ["word ptr [edx]"] }]
+DD3E;[{ "Type": "Fnstsw", "Operands": ["word ptr [esi]"] }]
+DD3F;[{ "Type": "Fnstsw", "Operands": ["word ptr [edi]"] }]
 
 # FSTSW/FNSTSW with displacement
-9BDD7C2510000000;[{ "Type": "Fstsw", "Operands": ["word ptr [eax+0x10]"] }]
-9BDD7C2520000000;[{ "Type": "Fstsw", "Operands": ["word ptr [eax+0x20]"] }]
-DD7C2510000000;[{ "Type": "Fnstsw", "Operands": ["word ptr [eax+0x10]"] }]
-DD7C2520000000;[{ "Type": "Fnstsw", "Operands": ["word ptr [eax+0x20]"] }]
+9BDDB810000000;[{ "Type": "Fstsw", "Operands": ["word ptr [eax+0x10]"] }]
+9BDDB820000000;[{ "Type": "Fstsw", "Operands": ["word ptr [eax+0x20]"] }]
+DDB810000000;[{ "Type": "Fnstsw", "Operands": ["word ptr [eax+0x10]"] }]
+DDB820000000;[{ "Type": "Fnstsw", "Operands": ["word ptr [eax+0x20]"] }]
 
 # FSTSW/FNSTSW with SIB addressing
 9BDD3C04;[{ "Type": "Fstsw", "Operands": ["word ptr [esp+eax*1]"] }]
@@ -45,15 +45,15 @@ DD3C94;[{ "Type": "Fnstsw", "Operands": ["word ptr [esp+edx*4]"] }]
 DD3CDC;[{ "Type": "Fnstsw", "Operands": ["word ptr [esp+ebx*8]"] }]
 
 # FSTSW/FNSTSW with segment override prefixes
-269BDD3C25;[{ "Type": "Fstsw", "Operands": ["word ptr es:[eax]"] }]
-2E9BDD3C25;[{ "Type": "Fstsw", "Operands": ["word ptr cs:[eax]"] }]
-369BDD3C25;[{ "Type": "Fstsw", "Operands": ["word ptr ss:[eax]"] }]
-3E9BDD3C25;[{ "Type": "Fstsw", "Operands": ["word ptr ds:[eax]"] }]
-649BDD3C25;[{ "Type": "Fstsw", "Operands": ["word ptr fs:[eax]"] }]
-659BDD3C25;[{ "Type": "Fstsw", "Operands": ["word ptr gs:[eax]"] }]
-26DD3C25;[{ "Type": "Fnstsw", "Operands": ["word ptr es:[eax]"] }]
-2EDD3C25;[{ "Type": "Fnstsw", "Operands": ["word ptr cs:[eax]"] }]
-36DD3C25;[{ "Type": "Fnstsw", "Operands": ["word ptr ss:[eax]"] }]
-3EDD3C25;[{ "Type": "Fnstsw", "Operands": ["word ptr ds:[eax]"] }]
-64DD3C25;[{ "Type": "Fnstsw", "Operands": ["word ptr fs:[eax]"] }]
-65DD3C25;[{ "Type": "Fnstsw", "Operands": ["word ptr gs:[eax]"] }]
+269BDD38;[{ "Type": "Fstsw", "Operands": ["word ptr es:[eax]"] }]
+2E9BDD38;[{ "Type": "Fstsw", "Operands": ["word ptr cs:[eax]"] }]
+369BDD38;[{ "Type": "Fstsw", "Operands": ["word ptr ss:[eax]"] }]
+3E9BDD38;[{ "Type": "Fstsw", "Operands": ["word ptr ds:[eax]"] }]
+649BDD38;[{ "Type": "Fstsw", "Operands": ["word ptr fs:[eax]"] }]
+659BDD38;[{ "Type": "Fstsw", "Operands": ["word ptr gs:[eax]"] }]
+26DD38;[{ "Type": "Fnstsw", "Operands": ["word ptr es:[eax]"] }]
+2EDD38;[{ "Type": "Fnstsw", "Operands": ["word ptr cs:[eax]"] }]
+36DD38;[{ "Type": "Fnstsw", "Operands": ["word ptr ss:[eax]"] }]
+3EDD38;[{ "Type": "Fnstsw", "Operands": ["word ptr ds:[eax]"] }]
+64DD38;[{ "Type": "Fnstsw", "Operands": ["word ptr fs:[eax]"] }]
+65DD38;[{ "Type": "Fnstsw", "Operands": ["word ptr gs:[eax]"] }]