diff --git a/build/pt0003.vcxproj b/build/pt0003.vcxproj
index 2eaaa0487..b08dd0d03 100644
--- a/build/pt0003.vcxproj
+++ b/build/pt0003.vcxproj
@@ -80,9 +80,9 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\..\wx289\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/cd/test/fp1084.txt b/cd/test/fp1084.txt
new file mode 100644
index 000000000..757eec36a
--- /dev/null
+++ b/cd/test/fp1084.txt
@@ -0,0 +1,3 @@
+fp0.exe
+
+I bolli esenti venivano addebitati se non era stato impostato l'importo minimo dei bolli esenti.
\ No newline at end of file
diff --git a/cd/test/fp1084a.ini b/cd/test/fp1084a.ini
new file mode 100644
index 000000000..d419a396b
--- /dev/null
+++ b/cd/test/fp1084a.ini
@@ -0,0 +1,19 @@
+[Main]
+Demo=0
+
+[fp0]
+File(0) = fp0.exe|X
+Patch = 1084
+Versione = 21511200
+
+[fp]
+Data = 09-09-2021
+Descrizione = Fattura Elettronica
+Dischi = 1
+Moduli = cg,ve
+OEM = 
+Patch = 1084
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/fp1084a1.zip b/cd/test/fp1084a1.zip
new file mode 100644
index 000000000..c554e35ee
Binary files /dev/null and b/cd/test/fp1084a1.zip differ
diff --git a/cd/test/ve1084.txt b/cd/test/ve1084.txt
new file mode 100644
index 000000000..40f0aa886
--- /dev/null
+++ b/cd/test/ve1084.txt
@@ -0,0 +1,3 @@
+ve0.exe
+
+I bolli esenti venivano addebitati se non era stato impostato l'importo minimo dei bolli esenti.
\ No newline at end of file
diff --git a/cd/test/ve1084a.ini b/cd/test/ve1084a.ini
new file mode 100644
index 000000000..c38a714ca
--- /dev/null
+++ b/cd/test/ve1084a.ini
@@ -0,0 +1,132 @@
+[Main]
+Demo=0
+
+[ve0]
+Edit_163 = ve0 -6
+Edit_4 = ve0 -4
+Edit_5 = ve0 -4
+File(20) = ve0.exe|X
+Patch = 1084
+Versione = 21511200
+
+[ve99]
+Kill(0) = batbimb.msk|x
+Kill(1) = batbacr.msk|x
+Kill(2) = batbtri.msk|x
+Kill(3) = batbeld.msk|x
+Kill(4) = ve7400a.ini|x
+Kill(5) = bastctr.msk|x
+Kill(6) = ve7200a.msk|x
+Kill(7) = bastcra.rep|x
+Kill(8) = efstbnp.rep|x
+Kill(9) = bastgcg.rep|x
+Kill(10) = basttag.rep|x
+Kill(11) = ve7701a.ini|x
+Kill(12) = batbnum.msk|x
+Kill(13) = bastfrr.msk|x
+Kill(14) = batbubi.msk|x
+Kill(15) = bastcau.msk|x
+Kill(16) = ve7400a.msk|x
+Kill(17) = bastcra.msk|x
+Kill(18) = ve7600a.msk|x
+Kill(19) = batbabe.msk|x
+Kill(20) = ve7300a.msk|x
+Kill(21) = bastgmc.msk|x
+Kill(22) = bastrfa.msk|x
+Kill(23) = bastfrr.rep|x
+Kill(24) = basteld.rep|x
+Kill(25) = batbtip.msk|x
+Kill(26) = batbpro.msk|x
+Kill(27) = bastprs.msk|x
+Kill(28) = batbbnp.msk|x
+Kill(29) = bastcau.rep|x
+Kill(30) = bastubi.msk|x
+Kill(31) = bastubi.rep|x
+Kill(32) = batbfsa.msk|x
+Kill(33) = bastrfa.rep|x
+Kill(34) = ve7700a.msk|x
+Kill(35) = ve7300a.frm|x
+Kill(36) = bastnum.msk|x
+Kill(37) = basttag.msk|x
+Kill(38) = bastcaa.rep|x
+Kill(39) = baststd.msk|x
+Kill(40) = batbasf.msk|x
+Kill(41) = bastgca.msk|x
+Kill(42) = batbfrd.msk|x
+Kill(43) = bastprs.rep|x
+Kill(44) = ve7100a.msk|x
+Kill(45) = bastfrm.msk|x
+Kill(46) = batbtag.msk|x
+Kill(47) = batbgcg.msk|x
+Kill(48) = bastrfc.msk|x
+Kill(49) = bastasf.msk|x
+Kill(50) = bastums.msk|x
+Kill(51) = bastcaa.msk|x
+Kill(52) = batbfid.msk|x
+Kill(53) = bastspp.msk|x
+Kill(54) = baststd.rep|x
+Kill(55) = bastfrm.rep|x
+Kill(56) = batbums.msk|x
+Kill(57) = bastfrd.msk|x
+Kill(58) = basttri.msk|x
+Kill(59) = batbspt.msk|x
+Kill(60) = bastbnp.msk|x
+Kill(61) = eftbbnp.msk|x
+Kill(62) = bastfca.msk|x
+Kill(63) = batbgmc.msk|x
+Kill(64) = bastrfc.rep|x
+Kill(65) = bastfrd.rep|x
+Kill(66) = batbspp.msk|x
+Kill(67) = batbcaa.msk|x
+Kill(68) = basteld.msk|x
+Kill(69) = bastimb.msk|x
+Kill(70) = basttri.rep|x
+Kill(71) = batbctr.msk|x
+Kill(72) = basttip.rep|x
+Kill(73) = bastabe.rep|x
+Kill(74) = bastfca.rep|x
+Kill(75) = bastctr.rep|x
+Kill(76) = batbprv.msk|x
+Kill(77) = ve7.exe|x
+Kill(78) = batbstd.msk|x
+Kill(79) = batbfrm.msk|x
+Kill(80) = batbgsa.msk|x
+Kill(81) = bastabe.msk|x
+Kill(82) = batbfca.msk|x
+Kill(83) = batbprs.msk|x
+Kill(84) = ve7400conf.ini|x
+Kill(85) = ve7500a.msk|x
+Kill(86) = bastnum.rep|x
+Kill(87) = ve7200a.frm|x
+Kill(88) = batbrfc.msk|x
+Kill(89) = bastasf.rep|x
+Kill(90) = batbfrr.msk|x
+Kill(91) = batbcra.msk|x
+Kill(92) = bastgcg.msk|x
+Kill(93) = batbcau.msk|x
+Kill(94) = batbrfa.msk|x
+Kill(95) = bastbnp.rep|x
+Kill(96) = efstbnp.msk|x
+Kill(97) = batbgca.msk|x
+Kill(98) = bastspp.rep|x
+Kill(99) = batbcld.msk|x
+Kill(100) = bastgca.rep|x
+Kill(101) = bastimb.rep|x
+Kill(102) = bastgmc.rep|x
+Kill(103) = bastums.rep|x
+Kill(104) = basttip.msk|x
+Kill(105) = batbmre.msk|x
+
+[ve]
+Data = 30-09-2021
+Descrizione = Vendite
+Dischi = 1
+Moduli = ba,cg9,pr9,mg9,sv9,in9,ef9
+OEM = 
+Patch = 1084
+PostProcess = bainst -0 VE
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/ve1084a1.zip b/cd/test/ve1084a1.zip
new file mode 100644
index 000000000..17270e396
Binary files /dev/null and b/cd/test/ve1084a1.zip differ