diff --git a/.gitattributes b/.gitattributes
index 4ccddb938ca61b3e41481c7a1e18bf64d5853978..dbc76b78d13b1ec10b750f9d5264f830d4e6430b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -124,12 +124,6 @@ appfw/tests/xquery/xpath_test/passwrd_xml.xml -text
 appfw/tests/xquery/xquery_test/Makefile -text
 appfw/tests/xquery/xquery_test/XQuery_Injection.cpp -text
 appfw/tests/xquery/xquery_test/passwrd_xml.xml -text
-bea_tests/Makefile -text
-bea_tests/avx1.nasm -text
-bea_tests/avx2.nasm -text
-bea_tests/dbea.c -text
-bea_tests/insns.s -text
-bea_tests/insns_avx.s -text
 beaengine/CMakeFiles/CMakeDetermineCompilerABI_C.bin -text
 beaengine/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin -text
 beaengine/CMakeFiles/cmake.check_cache -text
@@ -177,6 +171,12 @@ beaengine/include/beaengine/BeaEngine.h -text
 beaengine/include/beaengine/basic_types.h -text
 beaengine/include/beaengine/export.h -text
 beaengine/include/beaengine/macros.h -text
+beaengine/jdh_tests/Makefile -text
+beaengine/jdh_tests/avx1.nasm -text
+beaengine/jdh_tests/avx2.nasm -text
+beaengine/jdh_tests/dbea.c -text
+beaengine/jdh_tests/insns.s -text
+beaengine/jdh_tests/insns_avx.s -text
 /build.sh -text
 /configure -text
 /configure.in -text
diff --git a/beaengine/beaengineSources/Includes/instr_set/opcodes_SSE.c b/beaengine/beaengineSources/Includes/instr_set/opcodes_SSE.c
index 16294ccf549cd9eeb813e12c876739761dbf7aba..da0c0866276c9095ab31a873280b080c2df31a16 100644
--- a/beaengine/beaengineSources/Includes/instr_set/opcodes_SSE.c
+++ b/beaengine/beaengineSources/Includes/instr_set/opcodes_SSE.c
@@ -497,7 +497,7 @@ void __bea_callspec__ comiss_VW(PDISASM pMyDisasm)
     if ((*pMyDisasm).Prefix.OperandSize == InUsePrefix) {
         GV.OperandSize = GV.OriginalOperandSize;
         (*pMyDisasm).Prefix.OperandSize = MandatoryPrefix;
-        GV.MemDecoration = Arg2qword;
+        GV.MemDecoration = Arg2fword;
         (*pMyDisasm).Instruction.Category = SSE2_INSTRUCTION+COMPARISON_INSTRUCTION;
         #ifndef BEA_LIGHT_DISASSEMBLY
            (void) strcpy ((*pMyDisasm).Instruction.Mnemonic, "comisd ");
diff --git a/bea_tests/Makefile b/beaengine/jdh_tests/Makefile
similarity index 100%
rename from bea_tests/Makefile
rename to beaengine/jdh_tests/Makefile
diff --git a/bea_tests/avx1.nasm b/beaengine/jdh_tests/avx1.nasm
similarity index 100%
rename from bea_tests/avx1.nasm
rename to beaengine/jdh_tests/avx1.nasm
diff --git a/bea_tests/avx2.nasm b/beaengine/jdh_tests/avx2.nasm
similarity index 100%
rename from bea_tests/avx2.nasm
rename to beaengine/jdh_tests/avx2.nasm
diff --git a/bea_tests/dbea.c b/beaengine/jdh_tests/dbea.c
similarity index 100%
rename from bea_tests/dbea.c
rename to beaengine/jdh_tests/dbea.c
diff --git a/bea_tests/insns.s.REMOVED.git-id b/beaengine/jdh_tests/insns.s.REMOVED.git-id
similarity index 100%
rename from bea_tests/insns.s.REMOVED.git-id
rename to beaengine/jdh_tests/insns.s.REMOVED.git-id
diff --git a/bea_tests/insns_avx.s b/beaengine/jdh_tests/insns_avx.s
similarity index 100%
rename from bea_tests/insns_avx.s
rename to beaengine/jdh_tests/insns_avx.s