diff --git a/cd/test/ba0834.txt b/cd/test/ba0834.txt
index f961b6a8f..83f9a314e 100644
--- a/cd/test/ba0834.txt
+++ b/cd/test/ba0834.txt
@@ -1,14 +1,14 @@
-recdesc\f176.trr
-recdesc\f175.trr
-recdesc\f179.dir
-recdesc\f179.trr
+recdesc\f175.dir
 recdesc\f178.dir
-recdesc\f178.trr
 recdesc\f177.trr
 recdesc\f177.dir
+recdesc\f176.trr
+recdesc\f179.trr
 recdesc\f176.dir
-recdesc\f175.dir
-recdesc\f23.trr
-recdesc\f23.dir
+recdesc\f179.dir
+recdesc\f175.trr
+recdesc\f178.trr
+recdesc\f20.trr
+recdesc\f20.dir
 
 Aggiornamento tracciati per personalizzazioni FP
\ No newline at end of file
diff --git a/cd/test/ba0834a.ini b/cd/test/ba0834a.ini
index 29391e634..a72fc9e84 100644
--- a/cd/test/ba0834a.ini
+++ b/cd/test/ba0834a.ini
@@ -5,34 +5,34 @@ Demo=0
 Edit_4 = ba3 -0
 Edit_5 = ba3 -0
 Edit_6 = ba4 -1
-File(510) = recdesc\f175.trr|X
-File(511) = recdesc\f176.trr|X
-File(512) = recdesc\f177.trr|X
-File(513) = recdesc\f178.trr|X
-File(514) = recdesc\f179.trr|X
-File(517) = recdesc\f175.dir|X
-File(518) = recdesc\f176.dir|X
-File(519) = recdesc\f177.dir|X
-File(520) = recdesc\f178.dir|X
-File(521) = recdesc\f179.dir|X
-Patch = 0834
+File(225) = recdesc\f175.dir|X
+File(226) = recdesc\f175.trr|X
+File(227) = recdesc\f176.dir|X
+File(228) = recdesc\f176.trr|X
+File(229) = recdesc\f177.dir|X
+File(230) = recdesc\f177.trr|X
+File(231) = recdesc\f178.dir|X
+File(232) = recdesc\f178.trr|X
+File(233) = recdesc\f179.dir|X
+File(234) = recdesc\f179.trr|X
+Patch = 834
 Versione = 21511200
 
 [ba2]
-File(372) = recdesc\f23.dir|X
-File(373) = recdesc\f23.trr|X
-Patch = 0834
+File(380) = recdesc\f20.dir|X
+File(381) = recdesc\f20.trr|X
+Patch = 834
 Versione = 21511200
 
 [ba99]
-Kill(0) = batbsce.txt|x
-Kill(1) = wxmsw240.dll|x
-Kill(2) = bastcms.rep|x
-Kill(3) = bastcms.msk|x
-Kill(4) = bastfsc.msk|x
-Kill(5) = bastfsc.rep|x
-Kill(6) = bastuue.msk|x
-Kill(7) = bastuue.rep|x
+Kill(0) = wxmsw240.dll|x
+Kill(1) = batbsce.txt|x
+Kill(2) = bastfsc.rep|x
+Kill(3) = bastfsc.msk|x
+Kill(4) = bastcms.msk|x
+Kill(5) = bastcms.rep|x
+Kill(6) = bastuue.rep|x
+Kill(7) = bastuue.msk|x
 
 [ba]
 Data = 24-06-2019
@@ -40,7 +40,7 @@ Descrizione = Base
 Dischi = 1
 Moduli = sy
 OEM = 
-Patch = 834
+Patch = 0834
 PostProcess = bainst -0 BA
 PreProcess = 
 Prezzo(1) = 
diff --git a/cd/test/ba0834a1.zip b/cd/test/ba0834a1.zip
index bebbe35a2..484d57de1 100644
Binary files a/cd/test/ba0834a1.zip and b/cd/test/ba0834a1.zip differ
diff --git a/cd/test/cg0838.txt b/cd/test/cg0838.txt
new file mode 100644
index 000000000..2f42b794e
--- /dev/null
+++ b/cd/test/cg0838.txt
@@ -0,0 +1,6 @@
+cg2.exe
+cg2fppro.msk
+
+Aggiunta ritenuta da acconto da F1
+Corretto importo totale con ritenuta
+Aggiunto bottone in maschera fppro per solo collegamento senza riporto dati
diff --git a/cd/test/cg0838a.ini b/cd/test/cg0838a.ini
new file mode 100644
index 000000000..ab116fbac
--- /dev/null
+++ b/cd/test/cg0838a.ini
@@ -0,0 +1,95 @@
+[Main]
+Demo=0
+
+[cg2]
+Edit_23 = cg2 -0
+File(162) = cg2.exe|X
+File(176) = cg2fppro.msk|X
+Patch = 0838
+Versione = 21511200
+
+[cg99]
+Kill(0) = batbscc.msk|x
+Kill(1) = bastntb.rep|x
+Kill(2) = batbpor.msk|x
+Kill(3) = bastpdb.msk|x
+Kill(4) = bastcfi.rep|x
+Kill(5) = bastscc.msk|x
+Kill(6) = bastzon.msk|x
+Kill(7) = bastarb.msk|x
+Kill(8) = batbarb.msk|x
+Kill(9) = batbmsp.msk|x
+Kill(10) = batbpdb.msk|x
+Kill(11) = bastivd.rep|x
+Kill(12) = bastcam.msk|x
+Kill(13) = batbind.msk|x
+Kill(14) = bastesc.rep|x
+Kill(15) = bastzon.rep|x
+Kill(16) = batbleg.msk|x
+Kill(17) = batbdel.msk|x
+Kill(18) = batblia.msk|x
+Kill(19) = batblbu.msk|x
+Kill(20) = bastcco.msk|x
+Kill(21) = bastarb.rep|x
+Kill(22) = bastntb.msk|x
+Kill(23) = bastvet.msk|x
+Kill(24) = bastndo.rep|x
+Kill(25) = batbcam.msk|x
+Kill(26) = bastcve.msk|x
+Kill(27) = bastleg.msk|x
+Kill(28) = batbvet.msk|x
+Kill(29) = batbndo.msk|x
+Kill(30) = bastpor.rep|x
+Kill(31) = bastesc.msk|x
+Kill(32) = batbcfi.msk|x
+Kill(33) = bastvet.rep|x
+Kill(34) = bastdpn.rep|x
+Kill(35) = batbver.msk|x
+Kill(36) = bastdpn.msk|x
+Kill(37) = bastreg.rep|x
+Kill(38) = bastnot.msk|x
+Kill(39) = batbcco.msk|x
+Kill(40) = batbdpn.msk|x
+Kill(41) = bastcco.rep|x
+Kill(42) = batbreg.msk|x
+Kill(43) = bastpor.msk|x
+Kill(44) = batbnot.msk|x
+Kill(45) = batblia.msk|x
+Kill(46) = bastreg.msk|x
+Kill(47) = batbzon.msk|x
+Kill(48) = bastmsp.rep|x
+Kill(49) = bastivd.msk|x
+Kill(50) = batbtit.msk|x
+Kill(51) = bastcam.rep|x
+Kill(52) = bastpdb.rep|x
+Kill(53) = batbntb.msk|x
+Kill(54) = bastndo.msk|x
+Kill(55) = bastmsp.msk|x
+Kill(56) = bastnot.rep|x
+Kill(57) = batbinl.msk|x
+Kill(58) = batbins.msk|x
+Kill(59) = cgtbcon.msk|x
+Kill(60) = bastcfi.msk|x
+Kill(61) = bastver.msk|x
+Kill(62) = batbcve.msk|x
+Kill(63) = bastcve.rep|x
+Kill(64) = batbivd.msk|x
+Kill(65) = batbesc.msk|x
+Kill(66) = batbtra.msk|x
+Kill(67) = bastscc.rep|x
+Kill(68) = bastver.rep|x
+Kill(69) = bastleg.rep|x
+
+[cg]
+Data = 25-06-2019
+Descrizione = Contabilita' Generale
+Dischi = 1
+Moduli = ba
+OEM = 
+Patch = 838
+PostProcess = bainst -0 CG
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/cg0838a1.zip b/cd/test/cg0838a1.zip
new file mode 100644
index 000000000..c22f30a87
Binary files /dev/null and b/cd/test/cg0838a1.zip differ
diff --git a/cd/test/fp0836.txt b/cd/test/fp0836.txt
new file mode 100644
index 000000000..596747327
--- /dev/null
+++ b/cd/test/fp0836.txt
@@ -0,0 +1,4 @@
+fp0.exe
+
+Esportazione da f1-fp delle ritenute di acconto
+Correzione se importo e' nullo
diff --git a/cd/test/fp0836a.ini b/cd/test/fp0836a.ini
new file mode 100644
index 000000000..26d63b332
--- /dev/null
+++ b/cd/test/fp0836a.ini
@@ -0,0 +1,19 @@
+[Main]
+Demo=0
+
+[fp1]
+File(0) = fp0.exe|X
+Patch = 0836
+Versione = 21511200
+
+[fp]
+Data = 25-06-2019
+Descrizione = Fattura Elettronica
+Dischi = 1
+Moduli = cg,ve
+OEM = 
+Patch = 836
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/fp0836a1.zip b/cd/test/fp0836a1.zip
new file mode 100644
index 000000000..a3b3ebb25
Binary files /dev/null and b/cd/test/fp0836a1.zip differ