diff --git a/cd/test/cg0602.txt b/cd/test/cg0602.txt
new file mode 100644
index 000000000..8c2fda7e2
--- /dev/null
+++ b/cd/test/cg0602.txt
@@ -0,0 +1,9 @@
+cg2.exe
+cg3.exe
+cg0200a.msk
+
+Aggiunta la possibilità di corregere l'importo della riga e il totale docmento negli incassi e pagamenti con saldaconto.
+
+Corretto calcolo IVA CEE/Ritenute nel caso di note di credito
+
+Modificata maschera clienti/fornitori
\ No newline at end of file
diff --git a/cd/test/cg0602a.ini b/cd/test/cg0602a.ini
new file mode 100644
index 000000000..40f00ff99
--- /dev/null
+++ b/cd/test/cg0602a.ini
@@ -0,0 +1,104 @@
+[Main]
+Demo=0
+
+[cg1]
+Edit_23 = cg2 -0
+File(8) = cg2.exe|X
+File(21) = cg3.exe|X
+Patch = 602
+Versione = 21511200
+
+[cg9]
+Edit_19 = cg0 -0
+Edit_20 = cg0 -1
+Edit_26 = cg0 -4
+Edit_5 = cg0 -5
+File(129) = cg0200a.msk|X
+Patch = 602
+Versione = 21511200
+
+[cg99]
+Kill(0) = bastcfi.msk|x
+Kill(1) = batbver.msk|x
+Kill(2) = bastndo.rep|x
+Kill(3) = bastcve.msk|x
+Kill(4) = bastntb.rep|x
+Kill(5) = batblbu.msk|x
+Kill(6) = bastpor.rep|x
+Kill(7) = bastnot.msk|x
+Kill(8) = bastvet.msk|x
+Kill(9) = batbntb.msk|x
+Kill(10) = batbcfi.msk|x
+Kill(11) = batbpor.msk|x
+Kill(12) = bastmsp.rep|x
+Kill(13) = bastcco.msk|x
+Kill(14) = batbndo.msk|x
+Kill(15) = bastndo.msk|x
+Kill(16) = batbleg.msk|x
+Kill(17) = bastmsp.msk|x
+Kill(18) = bastscc.rep|x
+Kill(19) = batbmsp.msk|x
+Kill(20) = batbind.msk|x
+Kill(21) = bastesc.msk|x
+Kill(22) = bastpor.msk|x
+Kill(23) = bastreg.rep|x
+Kill(24) = batbcam.msk|x
+Kill(25) = bastcve.rep|x
+Kill(26) = batbesc.msk|x
+Kill(27) = bastver.msk|x
+Kill(28) = cgtbcon.msk|x
+Kill(29) = bastzon.msk|x
+Kill(30) = batbpdb.msk|x
+Kill(31) = batbins.msk|x
+Kill(32) = batbdpn.msk|x
+Kill(33) = batbcco.msk|x
+Kill(34) = batbnot.msk|x
+Kill(35) = bastarb.msk|x
+Kill(36) = bastnot.rep|x
+Kill(37) = batbvet.msk|x
+Kill(38) = bastivd.rep|x
+Kill(39) = bastarb.rep|x
+Kill(40) = batbdel.msk|x
+Kill(41) = batblia.msk|x
+Kill(42) = bastpdb.rep|x
+Kill(43) = batbtra.msk|x
+Kill(44) = bastdpn.rep|x
+Kill(45) = bastcam.msk|x
+Kill(46) = bastreg.msk|x
+Kill(47) = batbinl.msk|x
+Kill(48) = bastleg.rep|x
+Kill(49) = bastver.rep|x
+Kill(50) = bastpdb.msk|x
+Kill(51) = bastntb.msk|x
+Kill(52) = batbreg.msk|x
+Kill(53) = bastesc.rep|x
+Kill(54) = bastcam.rep|x
+Kill(55) = bastleg.msk|x
+Kill(56) = bastdpn.msk|x
+Kill(57) = batbzon.msk|x
+Kill(58) = batbivd.msk|x
+Kill(59) = batbtit.msk|x
+Kill(60) = batblia.msk|x
+Kill(61) = bastzon.rep|x
+Kill(62) = bastivd.msk|x
+Kill(63) = bastvet.rep|x
+Kill(64) = batbscc.msk|x
+Kill(65) = batbcve.msk|x
+Kill(66) = batbarb.msk|x
+Kill(67) = bastcfi.rep|x
+Kill(68) = bastcco.rep|x
+Kill(69) = bastscc.msk|x
+
+[cg]
+Data = 06-07-2018
+Descrizione = Contabilita' Generale
+Dischi = 1
+Moduli = ba
+OEM = 
+Patch = 602
+PostProcess = bainst -0 CG
+PreProcess = 
+Prezzo(1) = 
+Prezzo(2) = 
+Versione = 21511200
+
diff --git a/cd/test/cg0602a1.zip b/cd/test/cg0602a1.zip
new file mode 100644
index 000000000..7ca351cfe
Binary files /dev/null and b/cd/test/cg0602a1.zip differ
diff --git a/cd/test/fp0600.txt b/cd/test/fp0600.txt
index 0467d9765..4e0346c9f 100644
--- a/cd/test/fp0600.txt
+++ b/cd/test/fp0600.txt
@@ -1,4 +1,4 @@
 fp0.exe
 fp0100a.msk
-sql/fp0100.sql
+sql/fp0/fp0100.sql
 fp0300a.msk
diff --git a/cd/test/fp0600a.ini b/cd/test/fp0600a.ini
index eaea24a1f..9034e0566 100644
--- a/cd/test/fp0600a.ini
+++ b/cd/test/fp0600a.ini
@@ -5,8 +5,8 @@ Demo=0
 File(0) = fp0.exe|X
 File(1) = fp0100a.msk|X
 File(3) = fp0300a.msk|X
-File(4) = sql/fp0100.sql|X
-Patch = 0600
+File(4) = sql/fp0/fp0100.sql|X
+Patch = 600
 Versione = 21511200
 
 [fp]
diff --git a/cd/test/fp0600a1.zip b/cd/test/fp0600a1.zip
index 8c66adac8..756d2b430 100644
Binary files a/cd/test/fp0600a1.zip and b/cd/test/fp0600a1.zip differ
diff --git a/cd/test/np0602.txt b/cd/test/np0602.txt
new file mode 100644
index 000000000..48254188e
--- /dev/null
+++ b/cd/test/np0602.txt
@@ -0,0 +1,10 @@
+np0.exe
+np0200a.msk
+np0500a.msk
+np0500b.msk
+np0300a.msk
+np0400a.msk
+npmenu.men
+nptbent.msk
+
+Abilitata temporaneamente la contabilità insieme alla contabilità generale
\ No newline at end of file
diff --git a/cd/test/np0602a.ini b/cd/test/np0602a.ini
new file mode 100644
index 000000000..8d57de509
--- /dev/null
+++ b/cd/test/np0602a.ini
@@ -0,0 +1,27 @@
+[Main]
+Demo=0
+
+[np0]
+Edit_163 = np0 -0
+File(0) = np0.exe|X
+File(1) = np0200a.msk|X
+File(2) = np0300a.msk|X
+File(3) = np0400a.msk|X
+File(4) = np0500a.msk|X
+File(5) = np0500b.msk|X
+File(6) = npmenu.men|X
+File(7) = nptbent.msk|X
+Patch = 602
+Versione = 21511200
+
+[np]
+Data = 10-01-2017
+Descrizione = Contabilità separata
+Dischi = 1
+Moduli = cg
+OEM = 
+Patch = 602
+PostProcess = 
+PreProcess = 
+Versione = 21511200
+
diff --git a/cd/test/np0602a1.zip b/cd/test/np0602a1.zip
new file mode 100644
index 000000000..68f1203bb
Binary files /dev/null and b/cd/test/np0602a1.zip differ