Mercurial Mercurial > oss > FCL > sf > os > security / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cryptomgmtlibs/securitytestfw/test/autotesting/test_spec.txt
changeset 60 11c66574c2a2
parent 15 da2ae96f639b 
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/test_spec.txt	Fri Apr 16 16:52:34 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/test_spec.txt	Mon May 03 14:11:52 2010 +0300
@@ -17,15 +17,15 @@
 #
 # WARNING - There must not be more than one test block for any of the components.  
 # E.g. SWI has one and only one [SWI] section in this file.  Otherwise 
-# \security\testframework\test\test_launcher.pl will be broken.
+# %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\test_launcher.pl will be broken.
 
   
 ###############################################################################
 #                             COMPONENT ASSIGNMENT                            #
 ###############################################################################
-{9.5}=Init,Crypto,CryptoTokens,CAF2,Common,Certman,SWI,IntegrityServices,Asnpkcs,Filetokens,SisTools,SwiTools95Only,SwiTools,CryptoSpi,UPS,StreamingCAF,SecurityTools,Misc,ToolsLegacy,UptoMCL
-{9.6}=Init,Crypto,CryptoTokens,CAF2,CAF296,Common,Certman,SWI,Asnpkcs,Filetokens,FileTokens_UseAuth,SisTools,SwiTools,CryptoSpi,UPS,StreamingCAF,SecurityTools,USIF,Misc,ToolsNew,SwiDiran,AuthServer
-{future}=Init,Crypto,CryptoTokens,CAF2,CAF296,CAF2Future,Common,Certman,SWI,Asnpkcs,Filetokens,FileTokens_UseAuth,SisTools,SwiTools,CryptoSpi,UPS,AuthServer,StreamingCAF,SecurityTools,USIF,Misc,ToolsNew,SwiDiran
+{tb92SF}=Init,Crypto,CryptoTokens,CAF2,CAF296,Common,Certman,Asnpkcs,Filetokens,CryptoSpi,UPS,StreamingCAF,SecurityTools,Misc
+{tb101SF}=Init,Crypto,CryptoTokens,CAF2,CAF296,CAF2Future,Common,Certman,Asnpkcs,Filetokens,FileTokens_UseAuth,CryptoSpi,UPS,AuthServer,StreamingCAF,SecurityTools,Misc,FileTokens_HwImpl
+
 
 ###############################################################################
 #                               TEST DEFINITION                               #
@@ -53,36 +53,6 @@
 TESTEXECUTE, \logs\testexecute\tpaddingudeb.htm,, -Dtextshell -- \tpadding\tpaddingudeb.script, 300, UDEB,,
 
 # CRYPTO 
-tasymmetric, \tasymmetrictests.log,, -Dtextshell -- \tasymmetric\tasymmetrictests.txt \tasymmetrictests.log, 300, UDEB#UREL,,
-tsymmetric, \tsymmetrictests.log,, -Dtextshell -- \tsymmetric\tsymmetrictests.txt \tsymmetrictests.log, 300, UDEB#UREL,,
-tsymmetric, \AESECBVectorsScript.log,, -Dtextshell -- \tsymmetric\AESECBVectorsScript.txt \AESECBVectorsScript.log, 300, UDEB#UREL,,
-tsymmetric, \AESECB_KAT_VT.log,, -Dtextshell -- \tsymmetric\AESECB_KAT_VT.txt \AESECB_KAT_VT.log, 300, UDEB#UREL,,
-tsymmetric, \AESECB_KAT_VK.log,, -Dtextshell -- \tsymmetric\AESECB_KAT_VK.txt \AESECB_KAT_VK.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptECB128.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptECB128.txt \AESMonteCarloEncryptECB128.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptECB192.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptECB192.txt \AESMonteCarloEncryptECB192.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptECB256.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptECB256.txt \AESMonteCarloEncryptECB256.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptECB128.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptECB128.txt \AESMonteCarloDecryptECB128.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptECB192.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptECB192.txt \AESMonteCarloDecryptECB192.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptECB256.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptECB256.txt \AESMonteCarloDecryptECB256.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptCBC128.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptCBC128.txt \AESMonteCarloEncryptCBC128.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptCBC192.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptCBC192.txt \AESMonteCarloEncryptCBC192.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloEncryptCBC256.log,, -Dtextshell -- \tsymmetric\AESMonteCarloEncryptCBC256.txt \AESMonteCarloEncryptCBC256.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptCBC128.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC128.txt \AESMonteCarloDecryptCBC128.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptCBC192.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC192.txt \AESMonteCarloDecryptCBC192.log, 300, UDEB#UREL,,
-tsymmetric, \AESMonteCarloDecryptCBC256.log,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC256.txt \AESMonteCarloDecryptCBC256.log, 300, UDEB#UREL,,
-tsymmetric, \symmetricOOMtests.log,, -Dtextshell -- \tsymmetric\symmetricOOMtests.txt  \symmetricOOMtests.log, 300, UDEB#UREL,,
-
-tbigint, \tconstruction.log,, -Dtextshell -- \tbigint\tconstructiontests.txt  \tconstruction.log, 300, UDEB#UREL,,
-tbigint, \tbasicmaths.log,, -Dtextshell -- \tbigint\tbasicmathstests.txt  \tbasicmaths.log, 1500, UDEB#UREL,,
-tbigint, \tmontgomery.log,, -Dtextshell -- \tbigint\tmontgomerytests.txt  \tmontgomery.log, 300, UDEB#UREL,,
-tbigint, \tprime.log,, -Dtextshell -- \tbigint\tprimetests.txt  \tprime.log, 300, UDEB#UREL,,
-tbigint, \tprime2.log,, -Dtextshell -- \tbigint\tprimetests2.txt  \tprime2.log, 600, UDEB#UREL,,
-tbigint, \tprimegen.log,, -Dtextshell -- \tbigint\tprimegen.txt  \tprimegen.log, 300, UDEB#UREL,,
-tbigint, \tprimefailure.log,, -Dtextshell -- \tbigint\tprimefailuretests.txt  \tprimefailure.log, 300, UDEB#UREL,,
-
-tpkcs5kdf, \tpkcs12kdftests.log,, -Dtextshell -- \tpkcs5kdf\tpkcs12kdftests.txt   \tpkcs12kdftests.log, 600, UDEB#UREL,,
-TPBE, \tpbetestsv2.log,, -Dtextshell -- \tpbe\tpbetests_v2.txt \tpbetestsv2.log, 3000, UDEB#UREL,,
-
 # CRYPTO TMS SUPPORT
 tasymmetric, \logs\testexecute\tasymmetrictests.htm,, -Dtextshell -- \tasymmetric\tasymmetrictests.script \logs\testexecute\tasymmetrictests.htm, 300, UDEB#UREL,,
 tsymmetric, \logs\testexecute\tsymmetrictests.htm,, -Dtextshell -- \tsymmetric\tsymmetrictests.script \logs\testexecute\tsymmetrictests.htm, 300, UDEB#UREL,,
@@ -104,15 +74,15 @@
 tsymmetric, \logs\testexecute\AESMonteCarloDecryptCBC256.htm,, -Dtextshell -- \tsymmetric\AESMonteCarloDecryptCBC256.script \logs\testexecute\AESMonteCarloDecryptCBC256.htm, 300, UDEB#UREL,,
 tsymmetric, \logs\testexecute\symmetricOOMtests.htm,, -Dtextshell -- \tsymmetric\symmetricOOMtests.script  \logs\testexecute\symmetricOOMtests.htm, 300, UDEB#UREL,,
 
-tbigint, \logs\testexecute\tconstruction.htm,, -Dtextshell -- \tbigint\tconstructiontests.script  \logs\testexecute\tconstruction.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tbasicmaths.htm,, -Dtextshell -- \tbigint\tbasicmathstests.script  \logs\testexecute\tbasicmaths.htm, 1500, UDEB#UREL,,
-tbigint, \logs\testexecute\tmontgomery.htm,, -Dtextshell -- \tbigint\tmontgomerytests.script  \logs\testexecute\tmontgomery.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tprime.htm,, -Dtextshell -- \tbigint\tprimetests.script  \logs\testexecute\tprime.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tprime2.htm,, -Dtextshell -- \tbigint\tprimetests2.script  \logs\testexecute\tprime2.htm, 600, UDEB#UREL,,
-tbigint, \logs\testexecute\tprimegen.htm,, -Dtextshell -- \tbigint\tprimegen.script  \logs\testexecute\tprimegen.htm, 300, UDEB#UREL,,
-tbigint, \logs\testexecute\tprimefailure.htm,, -Dtextshell -- \tbigint\tprimefailuretests.script  \logs\testexecute\tprimefailure.htm, 300, UDEB#UREL,,
+tbigint, \logs\testexecute\tconstruction.htm,, -Dtextshell -- \tbigint\tconstructiontests.script \logs\testexecute\tconstruction.htm, 300, UDEB#UREL,,
+tbigint, \logs\testexecute\tbasicmaths.htm,, -Dtextshell -- \tbigint\tbasicmathstests.script \logs\testexecute\tbasicmaths.htm, 1500, UDEB#UREL,,
+tbigint, \logs\testexecute\tmontgomery.htm,, -Dtextshell -- \tbigint\tmontgomerytests.script \logs\testexecute\tmontgomery.htm, 300, UDEB#UREL,,
+tbigint, \logs\testexecute\tprime.htm,, -Dtextshell -- \tbigint\tprimetests.script \logs\testexecute\tprime.htm, 300, UDEB#UREL,,
+tbigint, \logs\testexecute\tprime2.htm,, -Dtextshell -- \tbigint\tprimetests2.script \logs\testexecute\tprime2.htm, 600, UDEB#UREL,,
+tbigint, \logs\testexecute\tprimegen.htm,, -Dtextshell -- \tbigint\tprimegen.script \logs\testexecute\tprimegen.htm, 300, UDEB#UREL,,
+tbigint, \logs\testexecute\tprimefailure.htm,, -Dtextshell -- \tbigint\tprimefailuretests.script \logs\testexecute\tprimefailure.htm, 300, UDEB#UREL,,
 
-tpkcs5kdf, \logs\testexecute\tpkcs12kdftests.htm,, -Dtextshell -- \tpkcs5kdf\tpkcs12kdftests.script   \logs\testexecute\tpkcs12kdftests.htm, 600, UDEB#UREL,,
+tpkcs5kdf, \logs\testexecute\tpkcs12kdftests.htm,, -Dtextshell -- \tpkcs5kdf\tpkcs12kdftests.script \logs\testexecute\tpkcs12kdftests.htm, 600, UDEB#UREL,,
 TPBE, \logs\testexecute\tpbetestsv2.htm,, -Dtextshell -- \tpbe\tpbetests_v2.script \logs\testexecute\tpbetestsv2.htm, 3000, UDEB#UREL,,
 
 
@@ -128,7 +98,6 @@
 TESTEXECUTE, \logs\testexecute\RTA.htm,, z:\RTA\RTA.script,1800, UDEB#UREL,\techview.bat,
 TESTEXECUTE, \logs\testexecute\tcafnodrmcap.htm,, z:\tcaf\tcafnodrmcap.script,300, UDEB#UREL,\techview.bat,
 
-
 [CAF296]
 # Should be run v9.6 onwards
 TESTEXECUTE, \logs\testexecute\RTA_64bit.htm,, z:\RTA\rta_64bit.script,1800, UDEB#UREL,\techview.bat,
@@ -140,6 +109,12 @@
 TESTEXECUTE, \logs\testexecute\tmtputils.htm,, z:\tcaf\tmtputils\tmtputils.script,1800, UDEB#UREL,\techview.bat,
 TESTEXECUTE, \logs\testexecute\tcafhelper.htm,, z:\tcaf\tcafhelper.script,1800, UDEB#UREL,\techview.bat,
 
+[StreamingCAF]
+#Streaming CAF Tests
+TESTEXECUTE, \logs\testexecute\tscaf.htm,,-Dtextshell --  z:\tcaf\tscaf\tscaf.script, 300, UDEB#UREL, ,
+TESTEXECUTE, \logs\testexecute\tscaf_oom.htm,,-Dtextshell --  z:\tcaf\tscaf\tscaf_oom.script, 300, UDEB, ,
+
+
 
 [Common]
 TESTEXECUTE, \logs\testexecute\trecogcert.htm,, \trecog\trecogcert.script, 300, UDEB#UREL,,
@@ -182,14 +157,14 @@
 
 tJarDownloader, \tJarDownloader.log,, -Dstartupmode=1 \tJarDownloader\scripts\script1.txt \tJarDownloader.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\jardownloaderwithauto.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat
 
-TESTEXECUTE, \logs\testexecute\tmidletuaheaderfilter.htm,,  -Dtextshell -- \tmidletuaheaderfilter\tmidletuaheaderfilter.script, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmi.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\preparetjardownloader.bat
+TESTEXECUTE, \logs\testexecute\tmidletuaheaderfilter.htm,,  -Dtextshell -- \tmidletuaheaderfilter\tmidletuaheaderfilter.script, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_jmi.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\preparetjardownloader.bat
 
 ITHARNESSMIDP, \itharnessmidp-conf1.log,, \JAVATEST.TXT \itharnessmidp-conf1.log, 1600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat,
 ITHARNESSMIDP, \itharnessmidp-conf2.log,, \JAVATEST2.TXT \itharnessmidp-conf2.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\backup_jmi_autodeletefiles.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\replace_jmi_autodeletefiles.bat
 ITHARNESSMIDP, \itharnessmidp-conf3.log,, \JAVATEST3.TXT \itharnessmidp-conf3.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat,
 ITHARNESSMIDP, \itharnessmidp-conf4.log,, \OTATests.txt \itharnessmidp-conf4.log, 1200, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_otasetup.bat, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\post_jmi_cleanup.bat revertotasetup
 ITHARNESSMIDP, \leavetest.log,, \leavetest.txt \leavetest.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat auto.cfg,
-ITHARNESSMIDP, \itharnessmidp-conf5.log,, \javaiaptest.txt \itharnessmidp-conf5.log, 1200, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat prompt.cfg, %SECURITYSOURCEDIR%\testframework\test\autotesting\runced c:\auto.cfg
+ITHARNESSMIDP, \itharnessmidp-conf5.log,, \javaiaptest.txt \itharnessmidp-conf5.log, 1200, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat prompt.cfg, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\runced c:\auto.cfg
 
 ITHARNESSMIDP, \itharnessmidp-ocsp-default.log,, \itharnessmidp\scripts\ocsp-Default.txt \itharnessmidp-ocsp-default.log, 300, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat ocsp-default,
 ITHARNESSMIDP, \itharnessmidp-ocsp-allWarnings.log,, \itharnessmidp\scripts\ocsp-allWarnings.txt \itharnessmidp-ocsp-allWarnings.log, 600, UDEB#UREL, \epoc32\winscw\c\itharnessmidp\scripts\batchfiles\pre_cert_copy.bat ocsp-allWarnings,
@@ -215,14 +190,6 @@
 #New tpkixcert tests using TEF framework
 TESTEXECUTE, \logs\testexecute\tpkixcert_tef.htm,, -Dtextshell --  \tpkixcert_tef\scripts\tpkixcert_tef.script, 900, UDEB#UREL,,
 
-TASN1, \TASN1.log,, -Dtextshell -- \tasn1\scripts\tasn1.txt \tasn1.log, 300, UDEB#UREL,, \epoc32\winscw\c\tasn1\scripts\batchfiles\tasn1_cleanup.bat
-Tx509, \tx509.log,, -Dtextshell -- \tx509\scripts\tx509.txt \tx509.log, 300, UDEB#UREL,, \epoc32\winscw\c\tx509\scripts\batchfiles\tx509_cleanup.bat
-Tx509, \tx509_dev_certs.log,, -Dtextshell -- \tx509\scripts\tx509_dev_certs.txt \tx509_dev_certs.log, 300, UDEB#UREL,,
-Tx509, \outFileOOM1.log,, -Dtextshell -- \TX509\SCRIPTS\TX509-OOM1.TXT \outFileOOM1.log, 300, UDEB#UREL,, \epoc32\winscw\c\tx509\scripts\batchfiles\tx509_cleanup.bat
-Tx509, \outFileOOM2.log,, -Dtextshell -- \TX509\SCRIPTS\TX509-OOM2.TXT \outFileOOM2.log, 300, UDEB#UREL,,
-Tx509, \tx509_dev_certs_oom.log,, -Dtextshell -- \tx509\scripts\tx509_dev_certs_oom.txt \tx509_dev_certs_oom.log, 300, UDEB#UREL,,
-tx509, \tx509_dnames.log,, -Dtextshell -- \tx509\scripts\tx509-dnames.txt \tx509_dnames.log, 300, UDEB#UREL,,
-
 # TMS SUPPORT
 TASN1, \logs\testexecute\TASN1.htm,, -Dtextshell -- \tasn1\scripts\tasn1.script \logs\testexecute\tasn1.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tasn1\scripts\batchfiles\tasn1_cleanup.bat
 Tx509, \logs\testexecute\tx509.htm,, -Dtextshell -- \tx509\scripts\tx509.script \logs\testexecute\tx509.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tx509\scripts\batchfiles\tx509_cleanup.bat
@@ -232,25 +199,12 @@
 Tx509, \logs\testexecute\tx509_dev_certs_oom.htm,, -Dtextshell -- \tx509\scripts\tx509_dev_certs_oom.script \logs\testexecute\tx509_dev_certs_oom.htm, 300, UDEB#UREL,,
 tx509, \logs\testexecute\tx509_dnames.htm,, -Dtextshell -- \tx509\scripts\tx509-dnames.script \logs\testexecute\tx509_dnames.htm, 300, UDEB#UREL,,
 
-TWTLSCERT, \twtlscert.log,, -Dtextshell -- \twtlscert\scripts\twtlscert.txt \twtlscert.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TWTLSCERT, \wtlstests1.log,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT1.TXT \wtlstests1.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TWTLSCERT, \wtlstests2.log,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT2.TXT \wtlstests2.log, 300, UDEB#UREL,, \epoc32\winscw\c\twtlscert\scripts\batchfiles\twtlscert_cleanup.bat
-TWTLSCERT, \wtlstests3.log,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT3.TXT \wtlstests3.log, 900, UDEB#UREL,, \epoc32\winscw\c\twtlscert\scripts\batchfiles\twtlscert_cleanup.bat
-
 # TMS SUPPORT
 TWTLSCERT, \logs\testexecute\twtlscert.htm,, -Dtextshell -- \twtlscert\scripts\twtlscert.script \logs\testexecute\twtlscert.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 TWTLSCERT, \logs\testexecute\wtlstests1.htm,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT1.script \logs\testexecute\wtlstests1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 TWTLSCERT, \logs\testexecute\wtlstests2.htm,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT2.script \logs\testexecute\wtlstests2.htm, 300, UDEB#UREL,, \epoc32\winscw\c\twtlscert\scripts\batchfiles\twtlscert_cleanup.bat
 TWTLSCERT, \logs\testexecute\wtlstests3.htm,, -Dtextshell -- \twtlscert\scripts\TWTLSCERT3.script \logs\testexecute\wtlstests3.htm, 900, UDEB#UREL,, \epoc32\winscw\c\twtlscert\scripts\batchfiles\twtlscert_cleanup.bat
 
-TPKIXCERT, \TPKIXCERT_log1.txt,,	-Dtextshell -- \TPKIXCERT\SCRIPTS\TPKIXTEST_part1.TXT \TPKIXCERT_log1.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_log2.txt,,	-Dtextshell -- \TPKIXCERT\SCRIPTS\TPKIXTEST_part2.TXT \TPKIXCERT_log2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_logcancel.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\CANCEL1.TXT \TPKIXCERT_logcancel.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_logoom1.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM1.TXT \TPKIXCERT_logoom1.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_logoom2.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM2.TXT \TPKIXCERT_logoom2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_logoom3.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM3.TXT \TPKIXCERT_logoom3.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-TPKIXCERT, \TPKIXCERT_logoom4.txt,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM4.TXT \TPKIXCERT_logoom4.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
 # TMS SUPPORT
 TPKIXCERT, \logs\testexecute\TPKIXCERT_log1.htm,,	-Dtextshell -- \TPKIXCERT\SCRIPTS\TPKIXTEST_part1.script \logs\testexecute\TPKIXCERT_log1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 TPKIXCERT, \logs\testexecute\TPKIXCERT_log2.htm,,	-Dtextshell -- \TPKIXCERT\SCRIPTS\TPKIXTEST_part2.script \logs\testexecute\TPKIXCERT_log2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
@@ -261,62 +215,33 @@
 TPKIXCERT, \logs\testexecute\TPKIXCERT_logoom4.htm,, -Dtextshell -- \TPKIXCERT\SCRIPTS\OOM4.script \logs\testexecute\TPKIXCERT_logoom4.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 
 
-tocsp, \tocsp_openssl.log,,         \system\tocsp\scripts\openssl.txt       \tocsp_openssl.log,          300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logxcert_local.log,,  \system\tocsp\scripts\xcert-local.txt   \tocsp_logxcert_local.log,   300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logopenssl_local.log,,\system\tocsp\scripts\openssl-local.txt \tocsp_logopenssl_local.log, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logerror.log,,        \system\tocsp\scripts\error.txt         \tocsp_logerror.log,         300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_defaultpolicy.log,,   \system\tocsp\scripts\defaultpolicy.txt \tocsp_defaultpolicy.log,    300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat ocsppolicy.ini,
-tocsp, \tocsp_newpolicy.log,,       \system\tocsp\scripts\newpolicy.txt     \tocsp_newpolicy.log,        300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat newpolicy.ini, 	\epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat ocsppolicy.ini
-tocsp, \tocsp_httpinterface.log,,   \system\tocsp\scripts\httpinterface.txt \tocsp_httpinterface.log,	 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
-
-tocsp, \tocsp_openssl.log,, -Dtextshell --          \system\tocsp\scripts\openssl.txt 	    \tocsp_openssl.log,          300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logxcert_local.log,, -Dtextshell --   \system\tocsp\scripts\xcert-local.txt   \tocsp_logxcert_local.log,   300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logopenssl_local.log,, -Dtextshell -- \system\tocsp\scripts\openssl-local.txt \tocsp_logopenssl_local.log, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logerror.log,, -Dtextshell --         \system\tocsp\scripts\error.txt         \tocsp_logerror.log,         300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_defaultpolicy.log,, -Dtextshell --    \system\tocsp\scripts\defaultpolicy.txt \tocsp_defaultpolicy.log,    300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat ocsppolicy.ini,
-tocsp, \tocsp_newpolicy.log,, -Dtextshell --        \system\tocsp\scripts\newpolicy.txt     \tocsp_newpolicy.log,        300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat newpolicy.ini,  \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat ocsppolicy.ini
-tocsp, \tocsp_httpinterface.log,, -Dtextshell --    \system\tocsp\scripts\httpinterface.txt \tocsp_httpinterface.log,    300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
-tocsp, \tocsp_logoom.log,, -Dtextshell -- 			\system\tocsp\scripts\xcert-oom.txt     \tocsp_logoom.log,           900, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-
 # TMS SUPPORT
-tocsp, \logs\testexecute\tocsp_openssl.htm,,         \system\tocsp\scripts\openssl.script \logs\testexecute\tocsp_openssl.htm,          300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logxcert_local.htm,,  \system\tocsp\scripts\xcert-local.script \logs\testexecute\tocsp_logxcert_local.htm,   300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logopenssl_local.htm,,\system\tocsp\scripts\openssl-local.script \logs\testexecute\tocsp_logopenssl_local.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_logerror.htm,,        \system\tocsp\scripts\error.script \logs\testexecute\tocsp_logerror.htm,         300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \logs\testexecute\tocsp_defaultpolicy.htm,,   \system\tocsp\scripts\defaultpolicy.script \logs\testexecute\tocsp_defaultpolicy.htm,    300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat ocsppolicy.ini,
-tocsp, \logs\testexecute\tocsp_newpolicy.htm,,       \system\tocsp\scripts\newpolicy.script \logs\testexecute\tocsp_newpolicy.htm,        300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat newpolicy.ini, 	\epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat ocsppolicy.ini
+tocsp, \logs\testexecute\tocsp_openssl.htm,,         \system\tocsp\scripts\openssl.script       \logs\testexecute\tocsp_openssl.htm,          300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logxcert_local.htm,,  \system\tocsp\scripts\xcert-local.script   \logs\testexecute\tocsp_logxcert_local.htm,   300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logopenssl_local.htm,, \system\tocsp\scripts\openssl-local.script \logs\testexecute\tocsp_logopenssl_local.htm, 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logerror.htm,,        \system\tocsp\scripts\error.script         \logs\testexecute\tocsp_logerror.htm,         300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_defaultpolicy.htm,,   \system\tocsp\scripts\defaultpolicy.script \logs\testexecute\tocsp_defaultpolicy.htm,    300, UDEB,,
+tocsp, \logs\testexecute\tocsp_newpolicy.htm,,       \system\tocsp\scripts\newpolicy.script     \logs\testexecute\tocsp_newpolicy.htm,        300, UDEB, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat 2002b28b-new.txt, 	\epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy.bat 2002b28b.txt
 tocsp, \logs\testexecute\tocsp_httpinterface.htm,,   \system\tocsp\scripts\httpinterface.script \logs\testexecute\tocsp_httpinterface.htm,	 300, UDEB, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
 
-tocsp, \tocsp_openssl.htm,, -Dtextshell --          \system\tocsp\scripts\openssl.script 	    \tocsp_openssl.htm,          300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logxcert_local.htm,, -Dtextshell --   \system\tocsp\scripts\xcert-local.script   \tocsp_logxcert_local.htm,   300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logopenssl_local.htm,, -Dtextshell -- \system\tocsp\scripts\openssl-local.script \tocsp_logopenssl_local.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_logerror.htm,, -Dtextshell --         \system\tocsp\scripts\error.script         \tocsp_logerror.htm,         300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
-tocsp, \tocsp_defaultpolicy.htm,, -Dtextshell --    \system\tocsp\scripts\defaultpolicy.script \tocsp_defaultpolicy.htm,    300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat ocsppolicy.ini,
-tocsp, \tocsp_newpolicy.htm,, -Dtextshell --        \system\tocsp\scripts\newpolicy.script     \tocsp_newpolicy.htm,        300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat newpolicy.ini,  \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat ocsppolicy.ini
-tocsp, \tocsp_httpinterface.htm,, -Dtextshell --    \system\tocsp\scripts\httpinterface.script \tocsp_httpinterface.htm,    300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
-tocsp, \tocsp_logoom.htm,, -Dtextshell -- 			\system\tocsp\scripts\xcert-oom.script     \tocsp_logoom.htm,           900, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_openssl.htm,, -Dtextshell --          \system\tocsp\scripts\openssl.script 	    \logs\testexecute\tocsp_openssl.htm,          300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logxcert_local.htm,, -Dtextshell --   \system\tocsp\scripts\xcert-local.script   \logs\testexecute\tocsp_logxcert_local.htm,   300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logopenssl_local.htm,, -Dtextshell -- \system\tocsp\scripts\openssl-local.script \logs\testexecute\tocsp_logopenssl_local.htm, 300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_logerror.htm,, -Dtextshell --         \system\tocsp\scripts\error.script         \logs\testexecute\tocsp_logerror.htm,         300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
+tocsp, \logs\testexecute\tocsp_defaultpolicy.htm,, -Dtextshell --    \system\tocsp\scripts\defaultpolicy.script \logs\testexecute\tocsp_defaultpolicy.htm,    300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat donothing,
+tocsp, \logs\testexecute\tocsp_newpolicy.htm,, -Dtextshell --        \system\tocsp\scripts\newpolicy.script     \logs\testexecute\tocsp_newpolicy.htm,        300, UREL, \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat 2002b28b-new.txt,  \epoc32\winscw\c\system\tocsp\scripts\setupocsppolicy_urel.bat 2002b28b.txt
+tocsp, \logs\testexecute\tocsp_httpinterface.htm,, -Dtextshell --    \system\tocsp\scripts\httpinterface.script \logs\testexecute\tocsp_httpinterface.htm,    300, UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	   \epoc32\winscw\c\tcertstore\scripts\batchfiles\post_httpinterface_restore.bat
+tocsp, \logs\testexecute\tocsp_logoom.htm,, -Dtextshell -- 			\system\tocsp\scripts\xcert-oom.script     \logs\testexecute\tocsp_logoom.htm,           900, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\pre_tocsp_backup.bat, 	\epoc32\winscw\c\tcertstore\scripts\batchfiles\post_tocsp_restore.bat
 
 
-t_certstore, \tcertstore_conf1.1.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf1.txt \tcertstore_conf1.1.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_conf1.2.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf1.txt \tcertstore_conf1.2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_conf1.3.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf1.txt \tcertstore_conf1.3.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \t_handle_1.txt,, -Dtextshell -- \tcertstore\scripts\t_handle_1.txt \t_handle_1.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
 # TMS SUPPORT
 t_certstore, \logs\testexecute\tcertstore_conf1.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf1.script \logs\testexecute\tcertstore_conf1.1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 t_certstore, \logs\testexecute\tcertstore_conf1.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf1.script \logs\testexecute\tcertstore_conf1.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 t_certstore, \logs\testexecute\tcertstore_conf1.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf1.script \logs\testexecute\tcertstore_conf1.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 t_certstore, \logs\testexecute\t_handle_1.htm,, -Dtextshell -- \tcertstore\scripts\t_handle_1.script \logs\testexecute\t_handle_1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 
-
-t_certstore, \tcertstore_oom.conf1.1.log,, -Dtextshell -- \tcertstore\scripts\oom1.txt \tcertstore_oom.conf1.1.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_oom.conf1.2.log,, -Dtextshell -- \tcertstore\scripts\oom2.txt \tcertstore_oom.conf1.2.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_oom.conf1.3.log,, -Dtextshell -- \tcertstore\scripts\oom3.txt \tcertstore_oom.conf1.3.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_cancel.conf1.1.log,, -Dtextshell -- \tcertstore\scripts\cancel1.txt \tcertstore_cancel.conf1.1.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_dsa.conf1.log,, -Dtextshell -- \tcertstore\scripts\dsa.txt \tcertstore_dsa.conf1.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_reload.log,, -Dtextshell -- \tcertstore\scripts\reload.txt \tcertstore_reload.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_apipolicing.log,, -Dtextshell -- \tcertstore\scripts\apipolicing.txt \tcertstore_apipolicing.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_errors.log,, -Dtextshell -- \tcertstore\scripts\filecertstore_errors.txt \tcertstore_errors.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
+//TEF Format
+t_certstore, \logs\testexecute\t_certstore_sha2.htm,, -Dtextshell -- \tcertstore\scripts\t_certstore_sha2.script \logs\testexecute\t_certstore_sha2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 
 # TMS SUPPORT
 t_certstore, \logs\testexecute\tcertstore_oom.conf1.1.htm,, -Dtextshell -- \tcertstore\scripts\oom1.script \logs\testexecute\tcertstore_oom.conf1.1.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
@@ -331,63 +256,39 @@
 
 
 # Configuration 2
-
-t_certstore, \tcertstore_conf2.1.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.txt \tcertstore_conf2.1.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat 
-t_certstore, \tcertstore_conf2.2.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf2.txt \tcertstore_conf2.2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_conf2.3.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf2.txt \tcertstore_conf2.3.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
 # Configuration 2 - TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_conf2.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.script \logs\testexecute\tcertstore_conf2.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat 
+t_certstore, \logs\testexecute\tcertstore_conf2.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.script \logs\testexecute\tcertstore_conf2.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configuration2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat 
 t_certstore, \logs\testexecute\tcertstore_conf2.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf2.script \logs\testexecute\tcertstore_conf2.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 t_certstore, \logs\testexecute\tcertstore_conf2.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf2.script \logs\testexecute\tcertstore_conf2.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 
 
 # Configuration 2a (asynch store)
-
-t_certstore, \tcertstore_conf2a.1.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.txt  \tcertstore_conf2a.1.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration2a.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat 
-t_certstore, \tcertstore_conf2a.2.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf2a.txt \tcertstore_conf2a.2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_conf2a.3.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf2.txt  \tcertstore_conf2a.3.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
 # Configuration 2a TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_conf2a.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.script  \logs\testexecute\tcertstore_conf2a.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration2a.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat 
+t_certstore, \logs\testexecute\tcertstore_conf2a.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf2.script  \logs\testexecute\tcertstore_conf2a.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configuration2a.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat 
 t_certstore, \logs\testexecute\tcertstore_conf2a.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf2a.script \logs\testexecute\tcertstore_conf2a.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 t_certstore, \logs\testexecute\tcertstore_conf2a.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf2.script  \logs\testexecute\tcertstore_conf2a.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 
 
 # Configuration 3
-
-t_certstore, \tcertstore_conf3.1.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf3.txt \tcertstore_conf3.1.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration3.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
-t_certstore, \tcertstore_conf3.2.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf3.txt \tcertstore_conf3.2.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certstore, \tcertstore_conf3.3.txt,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf3.txt \tcertstore_conf3.3.txt, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
 # Configuration 3 TMS SUPPORT
-t_certstore, \logs\testexecute\tcertstore_conf3.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf3.script \logs\testexecute\tcertstore_conf3.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configuration3.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
+t_certstore, \logs\testexecute\tcertstore_conf3.1.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore1-conf3.script \logs\testexecute\tcertstore_conf3.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configuration3.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
 t_certstore, \logs\testexecute\tcertstore_conf3.2.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore2-conf3.script \logs\testexecute\tcertstore_conf3.2.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 t_certstore, \logs\testexecute\tcertstore_conf3.3.htm,, -Dtextshell -- \tcertstore\scripts\unifiedcertstore3-conf3.script \logs\testexecute\tcertstore_conf3.3.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\cert_backup2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 
 
 # Configuration multicertstore
 
-t_certstore, \tcertstore_multi.txt,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter.txt \tcertstore_multi.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configurationmulti.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
+t_certstore, \logs\testexecute\tcertstore_multi.htm,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter.script \logs\testexecute\tcertstore_multi.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configurationmulti.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
 
 # Configuration multicertstore 1
 
-t_certstore, \tcertstore_multi.1.txt,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter1.txt \tcertstore_multi.1.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configurationmulti1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
+t_certstore, \logs\testexecute\tcertstore_multi.1.htm,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter1.script \logs\testexecute\tcertstore_multi.1.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configurationmulti1.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
 
 # Configuration multicertstore 2
 
-t_certstore, \tcertstore_multi.2.txt,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter2.txt \tcertstore_multi.2.txt, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\Configurationmulti2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
+t_certstore, \logs\testexecute\tcertstore_multi.2.htm,, -Dtextshell -- \tcertstore\scripts\multiplecertstoresfilter2.script \logs\testexecute\tcertstore_multi.2.htm, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\Configurationmulti2.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\enableplugin.bat
 
 # Configuration 4
-
-t_certstore, \swicertstore1.txt,, -Dtextshell --          \tcertstore\scripts\swicertstore1.txt \swicertstore1.txt,       300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \swicertstore2.txt,, -Dtextshell --          \tcertstore\scripts\swicertstore2.txt \swicertstore2.txt,       300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat 
-t_certstore, \swicertstore4.txt,, -Dtextshell --          \tcertstore\scripts\swicertstore4.txt \swicertstore4.txt,       300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat 
-t_certstore, \swicertstore_oom.txt,, -Dtextshell --    -o \tcertstore\scripts\swicertstore1.txt \swicertstore_oom.txt,    300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat 
-t_certstore, \swicertstore_cancel.txt,, -Dtextshell -- -c \tcertstore\scripts\swicertstore1.txt \swicertstore_cancel.txt, 300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \wri-swicertstore1.txt,, -Dtextshell --      \tcertstore\scripts\wri-swicertstore1.txt \wri-swicertstore1.txt,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-t_certstore, \wri-swicertstore2.txt,, -Dtextshell --      \tcertstore\scripts\wri-swicertstore2.txt \wri-swicertstore2.txt,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-
 # Configuration 4 TMS SUPPORT
 t_certstore, \logs\testexecute\swicertstore1.htm,, -Dtextshell --          \tcertstore\scripts\swicertstore1.script \logs\testexecute\swicertstore1.htm,       300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
 t_certstore, \logs\testexecute\swicertstore2.htm,, -Dtextshell --          \tcertstore\scripts\swicertstore2.script \logs\testexecute\swicertstore2.htm,       300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat 
@@ -399,52 +300,11 @@
 
 
 # Configuration 5
-t_certstore, \wri-swicertstore3.txt,, -Dtextshell --      \tcertstore\scripts\wri-swicertstore3.txt \wri-swicertstore3.txt,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup1.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
-
 # Configuration 5 TMS SUPPORT
 t_certstore, \logs\testexecute\wri-swicertstore3.htm,, -Dtextshell --      \tcertstore\scripts\wri-swicertstore3.script \logs\testexecute\wri-swicertstore3.htm,300, UDEB#UREL, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_backup1.bat, \epoc32\winscw\c\tcertstore\scripts\batchfiles\swicert_restore.bat
 
 
 ######### Composite Certstore Testing###################################################################################
-t_certstore, \tfilecertstore01.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore01.txt \tfilecertstore01.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore02.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore02.txt \tfilecertstore02.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 6 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore03.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore03.txt \tfilecertstore03.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 4 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore04.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore04.txt \tfilecertstore04.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 6 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore05.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore05.txt \tfilecertstore05.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 4 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore06.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore06.txt \tfilecertstore06.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore07.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore07.txt \tfilecertstore07.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 4 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore08.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore08.txt \tfilecertstore08.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt middle 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore09.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore09.txt \tfilecertstore09.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore10.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore10.txt \tfilecertstore10.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore11.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore11.txt \tfilecertstore11.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore renamed 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore12.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore12.txt \tfilecertstore12.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore13.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore13.txt \tfilecertstore13.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 3 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore14.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore14.txt \tfilecertstore14.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt middle 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore15.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore15.txt \tfilecertstore15.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore corrupt 0 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore16.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore16.txt \tfilecertstore16.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore17.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore17.txt \tfilecertstore17.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tfilecertstore18.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore18.txt \tfilecertstore18.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 3 2 1 0, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-
-t_certstore, \tswicertstore01.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore01.txt \tswicertstore01.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 5 void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore02.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore02.txt \tswicertstore02.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 6 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore03.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore03.txt \tswicertstore03.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 4 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore04.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore04.txt \tswicertstore04.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 6 5 3, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore05.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore05.txt \tswicertstore05.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 4 5, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore06.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore06.txt \tswicertstore06.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore07.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore07.txt \tswicertstore07.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 4 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore08.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore08.txt \tswicertstore08.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt middle 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore09.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore09.txt \tswicertstore09.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore10.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore10.txt \tswicertstore10.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 5 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore11.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore11.txt \tswicertstore11.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore renamed 1 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore12.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore12.txt \tswicertstore12.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 3 2, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore13.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore13.txt \tswicertstore13.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 3 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore14.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore14.txt \tswicertstore14.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt middle 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore15.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore15.txt \tswicertstore15.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore corrupt 0 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore16.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore16.txt \tswicertstore16.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 2 1, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore17.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore17.txt \tswicertstore17.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore18.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore18.txt \tswicertstore18.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore 5 3 2 1 0, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-t_certstore, \tswicertstore19.log,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tswicertstore19.txt \tswicertstore19.log, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialiseswicertstore writable void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
-
 # Composite Certstore Testing - TMS SUPPORT
 
 t_certstore, \logs\testexecute\tfilecertstore01.htm,, -Dtextshell -- \tcertstore\multiple_certstore\scripts\tfilecertstore01.script \logs\testexecute\tfilecertstore01.htm, 600, UDEB#UREL, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/initialise_certstore.bat initialisefilecertstore 5 void, /epoc32/winscw/c/tcertstore/multiple_certstore/scripts/batchfiles/cleanup_certstore.bat
@@ -490,11 +350,10 @@
 ######### Composite Certstore Testing###################################################################################
 
 
-
 [SWI]
 # Requires the following additional components to be built: SisTools, Certman
 
-TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\copyswitestfiles.bat,
+TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\copyswitestfiles.bat,
 
 #NQP Tests for DataProvider
 TESTEXECUTE, \logs\testexecute\tdataprovider.htm,, -Dstartupmode=1 -- z:\tswi\tdataprovider\scripts\tdataprovider.script, 600, UDEB#UREL,,
@@ -524,60 +383,57 @@
 
 TESTEXECUTE, \logs\testexecute\testaugmentations.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testaugmentations.script, 300, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\testpreinstalled.htm,, \tswi\tuiscriptadaptors\scripts\testpreinstalled.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testpreinstalled_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testpreinstalled_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testpreinstalled_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testpreinstalled_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 TESTEXECUTE, \logs\testexecute\testdependencies.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdependencies.script, 300, UDEB#UREL,,
 
 TESTEXECUTE, \logs\testexecute\tuiscriptadaptors.htm,, \tswi\tuiscriptadaptors\scripts\tuiscriptadaptors.script, 10000, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuiscriptadaptors_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\tuiscriptadaptors_post.bat
 TESTEXECUTE, \logs\testexecute\tuiscriptadaptors_winscw.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tuiscriptadaptors_winscw.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\copytuiscriptadaptors.bat,
 TESTEXECUTE, \logs\testexecute\testvids.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testvids.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tuiscriptadaptorsFH.htm,, \tswi\tuiscriptadaptors\scripts\tuiscriptadaptorsFH.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat,
+TESTEXECUTE, \logs\testexecute\tuiscriptadaptorsFH.htm,, \tswi\tuiscriptadaptors\scripts\tuiscriptadaptorsFH.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat,
 
 TESTEXECUTE, \logs\testexecute\testrucert.htm,, \tswi\tuiscriptadaptors\scripts\testrucert.script, 500, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\romupdate_withoutstubs_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\romupdate_withoutstubs_post.bat
 
-TESTEXECUTE, \logs\testexecute\testrun.htm,, \tswi\tuiscriptadaptors\scripts\testrun.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testrunft.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrunft.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini,
+TESTEXECUTE, \logs\testexecute\testrun.htm,, \tswi\tuiscriptadaptors\scripts\testrun.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testrunft.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrunft.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_shortrunwait.ini,
 
-TESTEXECUTE, \logs\testexecute\testrun2.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrun2.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_notallowrun.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testrun2.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testrun2.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_notallowrun.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 TESTEXECUTE, \logs\testexecute\testshutdown.htm,, \tswi\tuiscriptadaptors\scripts\testshutdown.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testasync.htm,, \tswi\tuiscriptadaptors\scripts\testasync.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat,
+TESTEXECUTE, \logs\testexecute\testasync.htm,, \tswi\tuiscriptadaptors\scripts\testasync.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat,
 TESTEXECUTE, \logs\testexecute\testasynccancel.htm,, \tswi\tuiscriptadaptors\scripts\testasynccancel.script, 3000, UDEB#UREL,,
 
 TESTEXECUTE, \logs\testexecute\tsisstub.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tsisstub.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tsisstub_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tsisstub_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\tsisstub_delete.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tsisstub_delete.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 TESTEXECUTE, \logs\testexecute\testasynccaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testasynccaps.script, 300, UDEB#UREL,,
 
-TESTEXECUTE, \logs\testexecute\devcerts_match.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_match.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat
+TESTEXECUTE, \logs\testexecute\devcerts_match.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_match.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat
 TESTEXECUTE, \logs\testexecute\devcerts_mismatch.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_mismatch.script, 300, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\devcerts_aggregate.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_aggregate.script, 300, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\devcerts_corrupt.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_corrupt.script, 300, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\devcerts_ocsp.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_ocsp.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\devcerts_backuprestore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backuprestore.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat
-TESTEXECUTE, \logs\testexecute\devcerts_backup.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backup.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat
-TESTEXECUTE, \logs\testexecute\devcerts_restore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_restore.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\changedevid.bat, \epoc32\winscw\c\tswi\tdevcerts\scripts\batchfiles\devcerts_restore_post.bat
+TESTEXECUTE, \logs\testexecute\devcerts_backuprestore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backuprestore.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat
+TESTEXECUTE, \logs\testexecute\devcerts_backup.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_backup.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautosimtsycfg.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat
+TESTEXECUTE, \logs\testexecute\devcerts_restore.htm,, -Dstartupmode=1 -- \tswi\tdevcerts\scripts\devcerts_restore.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\changedevid.bat, \epoc32\winscw\c\tswi\tdevcerts\scripts\batchfiles\devcerts_restore_post.bat
 
-TESTEXECUTE, \logs\testexecute\tsisregistrytest.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\tsisregistrytest.script, 1500, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\useautocfg.bat, \epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\tsisregistrytest_post.bat
+TESTEXECUTE, \logs\testexecute\tsisregistrytest.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\tsisregistrytest.script, 1500, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\useautocfg.bat, \epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\tsisregistrytest_post.bat
 TESTEXECUTE, \logs\testexecute\testVFPOnEmulator.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testVFPOnEmulator.script, 300, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\tdaemon.htm,, -Dstartupmode=1 -- \tswi\tdaemon\scripts\tdaemon.script, 300, UDEB#UREL,,  
 
 # createandsignunicode.pl needs to be run as it builds some SIS files the following tests rely on, however it is a SisTools test so it is run through a batch file and the results not recorded here
-TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\callcreateandsignunicode.bat,
+TESTEXECUTE, \logs\testexecute\dummytefscript.htm,, \dummytefscript.script, 2500, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\callcreateandsignunicode.bat,
 TESTEXECUTE, \logs\testexecute\tbackuprestore.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore.script, 1500, UDEB#UREL,\epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_post.bat
-TESTEXECUTE, \logs\testexecute\tbackuprestore_second_part.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_second_part.script, 300, UDEB, \epoc32\winscw\c\tswi\tbackuprestore\scripts\tbackuprestore_second_part_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\tbackuprestore_second_part_post.bat
 TESTEXECUTE, \logs\testexecute\tbackuprestoredrive_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestoredrive_emulator.script, 300, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\tbackuprestore_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_post.bat
 TESTEXECUTE, \logs\testexecute\tbackuprestore_policy_prepost_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_policy_prepost_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_policy_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_policy_post.bat
 TESTEXECUTE, \logs\testexecute\tbackuprestore_policylst_certfst_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_policylst_certfst_emulator.script, 300, UDEB#UREL, ,
 TESTEXECUTE, \logs\testexecute\tbackuprestore_cert_prepost_emulator.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_cert_prepost_emulator.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_cert_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_cert_post.bat
 TESTEXECUTE, \logs\testexecute\tbackuptrestore_exploratory.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuptrestore_exploratory.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tbackuprestore_no_overwrite.htm,, -Dstartupmode=1 -- \tswi\tbackuprestore\scripts\tbackuprestore_no_overwrite.script, 1500, UDEB#UREL,\epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_no_overwrite_pre.bat, \epoc32\winscw\c\tswi\tbackuprestore\scripts\batchfiles\tbackuprestore_no_overwrite_post.bat
-
 TESTEXECUTE, \logs\testexecute\tgenbackupmeta_udeb.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_udeb.script, 300, UDEB,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\premeta.bat,
 TESTEXECUTE, \logs\testexecute\tgenbackupmeta_urel.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_urel.script, 300, UREL,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\premeta.bat,
 
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_udeb.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_udeb.script, 300,UDEB,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
-TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_urel.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_urel.script, 300,UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
+TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_udeb.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_udeb.script, 300,UDEB,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
+TESTEXECUTE, \logs\testexecute\tgenbackupmeta_mandatory_urel.htm,, -Dstartupmode=1 -- \tswi\tgenbackupmeta\scripts\tgenbackupmeta_mandatory_urel.script, 300,UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat,\epoc32\winscw\c\tswi\tgenbackupmeta\scripts\postmeta.bat
 TESTEXECUTE, \logs\testexecute\trevocation.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\trevocation.script, 600, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\trevocation_unsigned.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\trevocation_unsigned.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\trevocation_unsigned.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\trevocation_unsigned.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 TESTEXECUTE, \logs\testexecute\tautosigning.htm,, -Dstartupmode=1 -- \tswi\tautosigning\scripts\tautosigning.script, 300, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\testdrm.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrm.script, 300, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\testdrmasync.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testdrmasync.script, 300, UDEB#UREL,,
@@ -585,27 +441,27 @@
 TESTEXECUTE, \logs\testexecute\testdiskfullemulator.htm,, \tswi\tuiscriptadaptors\scripts\testdiskfullemulator.script, 300, UDEB#UREL,,
 
 TESTEXECUTE, \logs\testexecute\testcancel.htm,, \tswi\tuiscriptadaptors\scripts\testcancel.script, 1500, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testmandatory.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testmandatory.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore.dat
-TESTEXECUTE, \logs\testexecute\testnotargetdevices.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnotargetdevices.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_incompifnotargetdevices.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testsystemcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testsystemcaps.script, 300, UDEB, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore.dat,
+TESTEXECUTE, \logs\testexecute\testmandatory.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testmandatory.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore_mandatory.dat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore.dat
+TESTEXECUTE, \logs\testexecute\testnotargetdevices.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnotargetdevices.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_incompifnotargetdevices.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testsystemcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testsystemcaps.script, 300, UDEB, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore.dat,
 TESTEXECUTE, \logs\testexecute\testsystemcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testsystemcaps.script, 300, UREL,,
-TESTEXECUTE, \logs\testexecute\testusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps.script, 300, UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
+TESTEXECUTE, \logs\testexecute\testusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps.script, 300, UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
 TESTEXECUTE, \logs\testexecute\testusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps.script, 300, UDEB,,
 
-TESTEXECUTE, \logs\testexecute\testusercaps_nousergrantcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_nousergrantcaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_nousergrantcaps.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testusercaps_restrictedusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_restrictedusercaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_restrictedusercaps.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testnoorphanedoverwrite.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnoorphanedoverwrite.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_noorphanedoverwrite.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\overwriteprivate.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_noprotectedorphanoverwrite.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini 
+TESTEXECUTE, \logs\testexecute\testusercaps_nousergrantcaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_nousergrantcaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_nousergrantcaps.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testusercaps_restrictedusercaps.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testusercaps_restrictedusercaps.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_restrictedusercaps.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testnoorphanedoverwrite.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnoorphanedoverwrite.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_noorphanedoverwrite.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\overwriteprivate.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_noprotectedorphanoverwrite.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini 
 TESTEXECUTE, \logs\testexecute\overwriteprivate_positive.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script, 300, UDEB, \epoc32\release\winscw\UDEB\Z\tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.bat swipolicy.ini 
-TESTEXECUTE, \logs\testexecute\overwriteprivate_positive.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script, 300, UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini 
-TESTEXECUTE, \logs\testexecute\testallowunsigned.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testallowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\tpathsubst.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubst.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_pathsubst.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\tpathsubstsysdrive.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubstsysdrive.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_verifysysdrive.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\overwriteprivate_positive.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\overwriteprivate_positive.script, 300, UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini 
+TESTEXECUTE, \logs\testexecute\testallowunsigned.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testallowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\tpathsubst.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubst.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_pathsubst.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\tpathsubstsysdrive.htm,, -Dstartupmode=1 -- \tswi\tpathsubst\scripts\tpathsubstsysdrive.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_verifysysdrive.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 
 TESTEXECUTE, \logs\testexecute\tpropagation_winscw.htm,, -Dtextshell -- \tswi\tuiscriptadaptors\scripts\tpropagation_winscw.script, 600, UDEB#UREL,,
 
 
-TESTEXECUTE, \logs\testexecute\testeclipseemulator.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testeclipseemulator.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\pre_testeclipseemulator.bat,%SECURITYSOURCEDIR%\testframework\test\autotesting\delstubtemp.bat
+TESTEXECUTE, \logs\testexecute\testeclipseemulator.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testeclipseemulator.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\pre_testeclipseemulator.bat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\delstubtemp.bat
 
 TESTEXECUTE, \logs\testexecute\testeclipse.htm,, \tswi\tuiscriptadaptors\scripts\testeclipse.script, 500, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testeclipse_pre.bat,\epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testeclipse_post.bat
 
@@ -621,25 +477,25 @@
 
 TESTEXECUTE, \logs\testexecute\cr956_test.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\cr956_test.script, 2000, UDEB#UREL,,
 
-TESTEXECUTE, \logs\testexecute\testuninstallation.htm,, \tswi\tuiscriptadaptors\scripts\testuninstallation.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testuninstallation_pre.bat, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testuninstallation.htm,, \tswi\tuiscriptadaptors\scripts\testuninstallation.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testuninstallation_pre.bat, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 
 TESTEXECUTE, \logs\testexecute\tuninstallpkgs.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tuninstallpkgs.script, 1000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testlogging.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\testlogging.script, 100, UDEB#UREL,\epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.iniwinscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testlogging.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\testlogging.script, 100, UDEB#UREL,\epoc32\winscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.iniwinscw\c\tswi\tsisregistrytest\Scripts\batchfiles\testlogging_pre.bat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 
 TESTEXECUTE, \logs\testexecute\test_pa_sapropagated_notdelete.htm,, \tswi\tuiscriptadaptors\scripts\test_pa_sapropagated_notdelete.script, 100, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\testpastub.htm,, \tswi\tuiscriptadaptors\scripts\testpastub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
-TESTEXECUTE, \logs\testexecute\testsapropagatedstub.htm,, \tswi\tuiscriptadaptors\scripts\testsapropagatedstub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testpastub.htm,, \tswi\tuiscriptadaptors\scripts\testpastub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testsapropagatedstub.htm,, \tswi\tuiscriptadaptors\scripts\testsapropagatedstub.script, 100, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 
 
 # Extended Key Usage check while installation of signed sis files.
-TESTEXECUTE, \logs\testexecute\testextension.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
-TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning.ini,
-TESTEXECUTE, \logs\testexecute\testextension_alternatecodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_alternatecodesigningoid.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_altcodesigningoid.ini,
-TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning_altcodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning_altcodesigningoid.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning_altcodesigningoid.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\testextension.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini,
+TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning.ini,
+TESTEXECUTE, \logs\testexecute\testextension_alternatecodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_alternatecodesigningoid.script, 300, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_altcodesigningoid.ini,
+TESTEXECUTE, \logs\testexecute\testextension_mandatecodesigning_altcodesigningoid.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testextension_mandatecodesigning_altcodesigningoid.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_mandatecodesigning_altcodesigningoid.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 
 # SwiConsole Tests
 TESTEXECUTE, \logs\testexecute\tswiconsole.htm,, -Dstartupmode=1 -- \tswi\tswiconsole\scripts\tswiconsole.script, 300, UDEB#UREL,
-TESTEXECUTE, \logs\testexecute\tswiconsole_allowunsigned.htm,, -Dstartupmode=1 -- \tswi\tswiconsole\scripts\tswiconsole_allowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\tswiconsole_allowunsigned.htm,, -Dstartupmode=1 -- \tswi\tswiconsole\scripts\tswiconsole_allowunsigned.script, 300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_allowunsigned.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 
 TESTEXECUTE, \logs\testexecute\testmulti.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testmulti.script, 300, UDEB#UREL,
 TESTEXECUTE, \logs\testexecute\generateregistrytestdata.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\generateregistrytestdata.script, 300, UDEB#UREL,,
@@ -647,7 +503,7 @@
 TESTEXECUTE, \logs\testexecute\removeregistrytestdata.htm,, -Dstartupmode=1 -- \tswi\tsisregistrytest\scripts\removeregistrytestdata.script, 300, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\truststatus.htm,, -Dstartupmode=1 -- \tswi\trevocation\scripts\truststatus.script, 600, UDEB#UREL,, 
 TESTEXECUTE, \logs\testexecute\testtruststatus.htm,, \tswi\tuiscriptadaptors\scripts\testtruststatus.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tresetdevice.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tresetdevice.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiPolicy.bat swipolicy.ini
+TESTEXECUTE, \logs\testexecute\tresetdevice.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\tresetdevice.script, 600, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy_deletepreinstalledfiles.ini, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiPolicy.bat swipolicy.ini
 
 # Test Non-Removable Flag
 TESTEXECUTE, \logs\testexecute\testnonremovable.htm,, -Dstartupmode=1 -- \tswi\tuiscriptadaptors\scripts\testnonremovable.script, 300, UDEB#UREL, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testnonremovable_pre.bat, \epoc32\winscw\c\tswi\tuiscriptadaptors\scripts\batchfiles\testnonremovable_post.bat
@@ -667,7 +523,7 @@
 #CR0914 Tests
 TESTEXECUTE, \logs\testexecute\integritychecktest.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest.script, 1000, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\integritychecktest5Install_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest5Install_winscw.script, 1000, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\integritychecktest5verify_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest5verify_winscw.script, 1000, UDEB#UREL,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat some_swicertstore.dat,%SECURITYSOURCEDIR%\testframework\test\autotesting\setupSwiCertstore.bat swicertstore.dat
+TESTEXECUTE, \logs\testexecute\integritychecktest5verify_winscw.htm,, -Dstartupmode=1 -- z:\tswi\tsisregistrytest\scripts\integritychecktest5verify_winscw.script, 1000, UDEB#UREL,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat some_swicertstore.dat,%SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\setupSwiCertstore.bat swicertstore.dat
 
 TESTEXECUTE, \logs\testexecute\testswiobserver.htm,, -Dstartupmode=1 -- z:\tswi\tswiobserver\scripts\testswiobserver.script, 300, UDEB#UREL,,
 swiobservertest.exe, \swiobservertest.log,, , 800, UDEB#UREL,,
@@ -687,8 +543,6 @@
 
 
 [Asnpkcs]
-TASNPKCS, \tasnpkcstests.log,, -Dtextshell -- \tasnpkcstests.txt \tasnpkcstests.log,	 300, UDEB#UREL,,
-
 # TMS SUPPORT
 TASNPKCS, \logs\testexecute\tasnpkcstests.htm,, -Dtextshell -- \tasnpkcstests.script \logs\testexecute\tasnpkcstests.htm,	 300, UDEB#UREL,,
 
@@ -696,27 +550,18 @@
 [Filetokens]
 TESTEXECUTE, \logs\testexecute\sec-filetokens-tools.htm,,  -Dstartupmode=1 -- \ttesttools\scripts\sec-filetokens-tools.script, 600, UDEB#UREL, \epoc32\winscw\c\ttesttools\data\pretools.bat, \epoc32\winscw\c\ttesttools\data\posttools.bat
 
-T_KEYSTORE, \tkeystore.log,,		     -Dstartupmode=1 -- \tkeystore\scripts\tkeystore.txt	\tkeystore.log,				300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\RemoveSecDlg.bat, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat 
-T_KEYSTORE, \tkeystore_authobjects.log,, -Dstartupmode=1 -- \tkeystore\scripts\authobjects.txt	\tkeystore_authobjects.log,		300, UDEB#UREL,,  
-T_KEYSTORE, \tkeystore_export.log,,      -Dstartupmode=1 -- \tkeystore\scripts\exportscript.txt	\tkeystore_export.log,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_oom.log,,         -Dstartupmode=1 -- \tkeystore\scripts\oom.txt		\tkeystore_oom.log,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_cancel.log,,      -Dstartupmode=1 -- \tkeystore\scripts\cancel.txt		\tkeystore_cancel.log,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_servoom.log,,	 -Dstartupmode=1 -- \tkeystore\scripts\servoom.txt		\tkeystore_servoom.log,			1800, UDEB,, 
-T_KEYSTORE, \tkeystore_reload.log,,      -Dstartupmode=1 -- \tkeystore\scripts\reload.txt		\tkeystore_reload.log,			300, UDEB#UREL,, 
+# TMS support
+T_KEYSTORE, \logs\testexecute\tkeystore.htm,,		     -Dstartupmode=1 -- \tkeystore\scripts\tkeystore.script	\logs\testexecute\tkeystore.htm,				300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\RemoveSecDlg.bat, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat 
 
-# TMS support
-T_KEYSTORE, \logs\testexecute\tkeystore.htm,,		     -Dstartupmode=1 -- \tkeystore\scripts\tkeystore.script	\logs\testexecute\tkeystore.htm,				300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\RemoveSecDlg.bat, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat 
+T_KEYSTORE, \logs\testexecute\tkeystore_authobjects.htm,, -Dstartupmode=1 -- \tkeystore\scripts\authobjects.script  \logs\testexecute\tkeystore_authobjects.htm, 300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_authobject_post.bat 
+
 T_KEYSTORE, \logs\testexecute\tkeystore_export.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\exportscript.script	\logs\testexecute\tkeystore_export.htm,			300, UDEB#UREL,, 
 T_KEYSTORE, \logs\testexecute\tkeystore_oom.htm,,         -Dstartupmode=1 -- \tkeystore\scripts\oom.script \logs\testexecute\tkeystore_oom.htm,			300, UDEB#UREL,, 
 T_KEYSTORE, \logs\testexecute\tkeystore_cancel.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\cancel.script \logs\testexecute\tkeystore_cancel.htm,			300, UDEB#UREL,, 
-T_KEYSTORE, \logs\testexecute\tkeystore_servoom.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\servoom.script \logs\testexecute\tkeystore_servoom.htm,			1800, UDEB,, 
+T_KEYSTORE, \logs\testexecute\tkeystore_servoom.htm,,	  -Dstartupmode=1 -- \tkeystore\scripts\servoom.script \logs\testexecute\tkeystore_servoom.htm,			1800, UDEB,, 
 T_KEYSTORE, \logs\testexecute\tkeystore_reload.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\reload.script \logs\testexecute\tkeystore_reload.htm,			300, UDEB#UREL,, 
 
 
-t_certapps, \tcertapps.log,, -Dstartupmode=1 -- \tcertapps\scripts\script1.txt \tcertapps.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certapps, \tcertapps-oom.log,, -Dstartupmode=1 -- -o \tcertapps\scripts\script1.txt \tcertapps-oom.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-t_certapps, \tcertapps-apipolicing.log,, -Dstartupmode=1 -- \tcertapps\scripts\apipolicing.txt \tcertapps-apipolicing.log, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
-
 # TMS support
 
 t_certapps, \logs\testexecute\tcertapps.htm,, -Dstartupmode=1 -- \tcertapps\scripts\script1.script \logs\testexecute\tcertapps.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
@@ -724,40 +569,39 @@
 t_certapps, \logs\testexecute\tcertapps-apipolicing.htm,, -Dstartupmode=1 -- \tcertapps\scripts\apipolicing.script \logs\testexecute\tcertapps-apipolicing.htm, 300, UDEB#UREL, \epoc32\winscw\c\twtlscert\scripts\batchfiles\precert_backup.bat, \epoc32\winscw\c\twtlscert\scripts\batchfiles\postcert_restore.bat
 
 [FileTokens_UseAuth]
-T_KEYSTORE, \oldserver_newfeature.log,,	-Dstartupmode=1 -- \tkeystore\scripts\oldserver_newfeature.txt	\oldserver_newfeature.log,				300, UDEB#UREL, %SECURITYSOURCEDIR%\testframework\test\autotesting\RemoveSecDlg.bat, 
+T_KEYSTORE, \logs\testexecute\oldserver_newfeature.htm,,		     -Dstartupmode=1 -- \tkeystore\scripts\oldserver_newfeature.script	\logs\testexecute\oldserver_newfeature.htm,				300, UDEB#UREL, %SECURITYSOURCEDIR%\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\RemoveSecDlg.bat,
 # The batch file run as part of first test is requried for running all tests in this section.
 TESTEXECUTE, \logs\testexecute\initialize.htm,, -Dstartupmode=1 --  \tkeystore\scripts\initialize.script, 100, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_nouserregistered.log,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_nouserregistered.txt	\tkeystore_nouserregistered.log,			300, UDEB#UREL, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_pre.bat,
 
 # TMS support
-T_KEYSTORE, \logs\testexecute\tkeystore_nouserregistered.htm,, -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_nouserregistered.script	\logs\testexecute\tkeystore_nouserregistered.htm,			300, UDEB#UREL, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_pre.bat,
+T_KEYSTORE, \logs\testexecute\tkeystore_nouserregistered.htm,,		     -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_nouserregistered.script	\logs\testexecute\tkeystore_nouserregistered.htm,			300, UDEB#UREL, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_pre.bat,
+
+# the execution of this code is a prerequisite for running the keystore tests against the test plugins.
 
 TESTEXECUTE, \logs\testexecute\reg_first_identity.htm,, -Dstartupmode=1 --  \tkeystore\scripts\reg_first_identity.script, 100, UDEB#UREL,,
 # These set of tests run when keystore has been enabled to use authentication server.
-T_KEYSTORE, \tkeystore_useauth.log,,     -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_useauth.txt	\tkeystore_useauth.log,			300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat 
-T_KEYSTORE, \tkeystore_authobjects_useauth.log,, -Dstartupmode=1 -- \tkeystore\scripts\authobjects_useauth.txt	\tkeystore_authobjects_useauth.log,		300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_authobject_post.bat 
-T_KEYSTORE, \tkeystore_export_useauth.log,,      -Dstartupmode=1 -- \tkeystore\scripts\exportscript_useauth.txt	\tkeystore_export_useauth.log,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_oom_useauth.log,,         -Dstartupmode=1 -- \tkeystore\scripts\oom_useauth.txt		\tkeystore_oom_useauth.log,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_cancel_useauth.log,,      -Dstartupmode=1 -- \tkeystore\scripts\cancel_useauth.txt		\tkeystore_cancel_useauth.log,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_servoom_useauth.log,,	 -Dstartupmode=1 -- \tkeystore\scripts\servoom_useauth.txt		\tkeystore_servoom_useauth.log,			5000, UDEB,, 
-T_KEYSTORE, \tkeystore_reload_useauth.log,,      -Dstartupmode=1 -- \tkeystore\scripts\reload_useauth.txt		\tkeystore_reload_useauth.log,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_capability_useauth.log,,	 -Dstartupmode=1 -- \tkeystore\scripts\capability_useauth.txt		\tkeystore_capability_useauth.log,	1800, UDEB,, 
-T_KEYSTORE, \tkeystore_authenticate_useauth.log,,	 -Dstartupmode=1 -- \tkeystore\scripts\authenticate_useauth.txt		\tkeystore_authenticate_useauth.log,	1800, UDEB,, 
-T_KEYSTORE, \tkeystore_authentication1.log,,	 -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication1.txt		\tkeystore_authentication1.log,	1800, UDEB,, 
-TESTEXECUTE, \logs\testexecute\reg_second_identity.htm,, -Dstartupmode=1 --  \tkeystore\scripts\reg_second_identity.script, 100, UDEB#UREL,,
-T_KEYSTORE, \tkeystore_authentication2.log,,      -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication2.txt		\tkeystore_authentication2.log,			300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_post.bat
+
+# TMS support
+T_KEYSTORE, \logs\testexecute\tkeystore_useauth.htm,,     -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_useauth.script	\logs\testexecute\tkeystore_useauth.htm,			300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat 
+T_KEYSTORE, \logs\testexecute\tkeystore_authobjects_useauth.htm,, -Dstartupmode=1 -- \tkeystore\scripts\authobjects_useauth.script	\logs\testexecute\tkeystore_authobjects_useauth.htm,		300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_authobject_post.bat 
 
 # TMS support
-T_KEYSTORE, \tkeystore_useauth.htm,,     -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_useauth.script	\tkeystore_useauth.htm,			300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_post.bat 
-T_KEYSTORE, \tkeystore_export_useauth.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\exportscript_useauth.script	\tkeystore_export_useauth.htm,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_oom_useauth.htm,,         -Dstartupmode=1 -- \tkeystore\scripts\oom_useauth.script		\tkeystore_oom_useauth.htm,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_cancel_useauth.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\cancel_useauth.script		\tkeystore_cancel_useauth.htm,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_servoom_useauth.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\servoom_useauth.script		\tkeystore_servoom_useauth.htm,			5000, UDEB,, 
-T_KEYSTORE, \tkeystore_reload_useauth.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\reload_useauth.script		\tkeystore_reload_useauth.htm,			300, UDEB#UREL,, 
-T_KEYSTORE, \tkeystore_capability_useauth.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\capability_useauth.script		\tkeystore_capability_useauth.htm,	1800, UDEB,, 
-T_KEYSTORE, \tkeystore_authenticate_useauth.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\authenticate_useauth.script		\tkeystore_authenticate_useauth.htm,	1800, UDEB,, 
-T_KEYSTORE, \tkeystore_authentication1.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication1.script		\tkeystore_authentication1.htm,	1800, UDEB,, 
-T_KEYSTORE, \tkeystore_authentication2.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication2.script		\tkeystore_authentication2.htm,			300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_post.bat
+T_KEYSTORE, \logs\testexecute\tkeystore_export_useauth.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\exportscript_useauth.script	\logs\testexecute\tkeystore_export_useauth.htm,			300, UDEB#UREL,, 
+T_KEYSTORE, \logs\testexecute\tkeystore_oom_useauth.htm,,         -Dstartupmode=1 -- \tkeystore\scripts\oom_useauth.script \logs\testexecute\tkeystore_oom_useauth.htm,			600, UDEB#UREL,, 
+T_KEYSTORE, \logs\testexecute\tkeystore_cancel_useauth.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\cancel_useauth.script \logs\testexecute\tkeystore_cancel_useauth.htm,			300, UDEB#UREL,, 
+T_KEYSTORE, \logs\testexecute\tkeystore_servoom_useauth.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\servoom_useauth.script \logs\testexecute\tkeystore_servoom_useauth.htm,			6000, UDEB,, 
+T_KEYSTORE, \logs\testexecute\tkeystore_reload_useauth.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\reload_useauth.script \logs\testexecute\tkeystore_reload_useauth.htm,			300, UDEB#UREL,, 
+T_KEYSTORE, \logs\testexecute\tkeystore_capability_useauth.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\capability_useauth.script \logs\testexecute\tkeystore_capability_useauth.htm,	1800, UDEB#UREL,, 
+T_KEYSTORE, \logs\testexecute\tkeystore_createoldkeystore.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\createoldkeystore.script		\logs\testexecute\tkeystore_createoldkeystore.htm,	1800, UDEB#UREL,\epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_migrate_pre.bat, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_migrate_copykeys.bat
+TESTEXECUTE, \logs\testexecute\keytool_migrate.htm,,  -Dstartupmode=1 -- \ttesttools\scripts\keytool_migrate.script, 600, UDEB#UREL,,
+T_KEYSTORE, \logs\testexecute\tkeystore_testnewkeystore.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\testnewkeystore.script		\logs\testexecute\tkeystore_testnewkeystore.htm,	1800, UDEB#UREL,\epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_migrate_post.bat, 
+
+
+# TMS support
+T_KEYSTORE, \logs\testexecute\tkeystore_authenticate_useauth.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\authenticate_useauth.script \logs\testexecute\tkeystore_authenticate_useauth.htm,	1800, UDEB#UREL,, 
+T_KEYSTORE, \logs\testexecute\tkeystore_authentication1.htm,,	 -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication1.script \logs\testexecute\tkeystore_authentication1.htm,	1800, UDEB#UREL,, 
+TESTEXECUTE, \logs\testexecute\reg_second_identity.htm,, -Dstartupmode=1 --  \tkeystore\scripts\reg_second_identity.script, 100, UDEB#UREL,,
+T_KEYSTORE, \logs\testexecute\tkeystore_authentication2.htm,,      -Dstartupmode=1 -- \tkeystore\scripts\tkeystore_authentication2.script \logs\testexecute\tkeystore_authentication2.htm,			300, UDEB#UREL,, \epoc32\winscw\c\tkeystore\scripts\batchfiles\tkeystore_useauthserver_post.bat
 
 
 [ToolsLegacy]
@@ -768,9 +612,6 @@
 # DUMPSIS test
 PERL, \dumpsis_test.txt,,\epoc32\winscw\c\tswi\tdumpsis\testDumpsis.pl, 300, UDEB,,\epoc32\winscw\c\tswi\tdumpsis\postdumpsistest.bat
 
-# Interpretsis
-PERL, \interpretsis_test.txt,,\epoc32\winscw\c\tswi\tinterpretsis\runtests.pl, 300, UDEB,, 
-
 [SisTools]
 # MAKESIS test
 # program,log,commdb,script,timeout,release,pre cmd,post cmd
@@ -781,10 +622,10 @@
 # SIGNSIS test
 PERL, \signsis_test.txt,,\epoc32\winscw\c\tswi\tsignsis\testSignsis.pl, 300, UDEB,,
 
-[ToolsNew]
+# Interpretsis
+PERL, \interpretsis_test.txt,,\epoc32\winscw\c\tswi\tinterpretsis\runtests.pl, 300, UDEB,, 
 
-# Interpretsis
-PERL, \interpretsis_test.txt,,\epoc32\winscw\c\tswi\tinterpretsis\runtests.pl usif, 300, UDEB,, 
+[ToolsNew]
 
 # Interpretsis Test Harness
 PERL, \interpretsis_test_harness.txt,,\epoc32\winscw\c\tswi\tinterpretsisinteg\runtest1.pl usifnative, 1000, UDEB,,
@@ -832,41 +673,36 @@
 upstest.exe, \upstest.log,,, 800, UDEB#UREL,,
 upstestobsif.exe, \upstestobsif.log,,, 800, UDEB#UREL,,
 upstestoom.exe, \upstestoom.log,,  , 800, UDEB,,
-upstestobsifoom.exe, \upstestobsifoom.log,, , 800, UDEB,,
+upstestobsifoom.exe, \upstestobsifoom.log,, , 800, UDEB,,\epoc32\data\Z\tups\integ\scripts\tups_networkingupsdisable.bat
 tmsgapp.exe, \tmsgapp.log,, -Dtextshell -- , 800, UDEB#UREL,,
 
 
 
 [AuthServer]
 # AuthServer tests
-TESTEXECUTE, \logs\testexecute\tauthkeys.htm,, -Dstartupmode=1 --  \tauth\tauthkeys\scripts\tauthkeys.script, 30, UDEB#UREL,,
+TESTEXECUTE, \logs\testexecute\tauthkeys.htm,,-Dstartupmode=1 --   \tauth\tauthkeys\scripts\tauthkeys.script, 30, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\tauthdb.htm,, -Dstartupmode=1 --  \tauth\tauthdb\scripts\tauthdb.script, 30, UDEB#UREL,,
 TESTEXECUTE, \logs\testexecute\tauthcliserv.htm,, -Dstartupmode=1 --   \tauth\tauthcliserv\scripts\tauthcliserv.script, 300, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthcliserv_debug.htm,, -Dstartupmode=1 --   \tauth\tauthcliserv\scripts\tauthcliserv_debug.script, 30, UDEB,,
-TESTEXECUTE, \logs\testexecute\tauthexpr.htm,, -Dstartupmode=1 --  \tauth\tauthexpr\scripts\tauthexpr.script, 500, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthplugins.htm,, -Dstartupmode=1 --  \tauth\tauthplugins\scripts\tauthplugins.script, 30, UDEB#UREL,,
-TESTEXECUTE, \logs\testexecute\tauthsvr2.htm,, -Dstartupmode=1 --   \tauth\tauthsvr\scripts\tauthsvr2.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_tauthsvr.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketplugin.htm,, -Dstartupmode=1 --  \tauth\tauthsvr\scripts\tpostmarketplugin.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketplugin_macroenabled.htm,, -Dstartupmode=1 --  \tauth\tauthsvr\scripts\tpostmarketplugin_macroenabled.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_postmarketplugin.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketpluginenabled1_winscw.htm,, -Dstartupmode=1 --   \tauth\tauthsvr\scripts\tpostmarketpluginenabled1_winscw.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_patchdata_positive.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
-TESTEXECUTE, \logs\testexecute\tpostmarketpluginenabled_winscw.htm,, -Dstartupmode=1 --  \tauth\tauthsvr\scripts\tpostmarketpluginenabled_winscw.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_patchdata_negative.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
+TESTEXECUTE, \logs\testexecute\tauthcliserv_debug.htm,,-Dstartupmode=1 --   \tauth\tauthcliserv\scripts\tauthcliserv_debug.script, 30, UDEB,,
+TESTEXECUTE, \logs\testexecute\tauthexpr.htm,, -Dstartupmode=1 --   \tauth\tauthexpr\scripts\tauthexpr.script, 500, UDEB#UREL,,
+TESTEXECUTE, \logs\testexecute\tauthplugins.htm,, -Dstartupmode=1 --   \tauth\tauthplugins\scripts\tauthplugins.script, 30, UDEB#UREL,,
+TESTEXECUTE, \logs\testexecute\tauthsvr2.htm,, -Dstartupmode=1 --  \tauth\tauthsvr\scripts\tauthsvr2.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_tauthsvr.bat
+TESTEXECUTE, \logs\testexecute\tauthsvrclock.htm,, -Dstartupmode=1 --  \tauth\tauthsvr\scripts\tauthsvrclock.script, 1600, UDEB#UREL,,
+TESTEXECUTE, \logs\testexecute\tpostmarketplugin.htm,, -Dstartupmode=1 --   \tauth\tauthsvr\scripts\tpostmarketplugin.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
+TESTEXECUTE, \logs\testexecute\tpostmarketplugin_macroenabled.htm,,-Dstartupmode=1 --   \tauth\tauthsvr\scripts\tpostmarketplugin_macroenabled.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_postmarketplugin.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
+TESTEXECUTE, \logs\testexecute\tpostmarketpluginenabled1_winscw.htm,, -Dstartupmode=1 --  \tauth\tauthsvr\scripts\tpostmarketpluginenabled1_winscw.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_patchdata_positive.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
+TESTEXECUTE, \logs\testexecute\tpostmarketpluginenabled_winscw.htm,, -Dstartupmode=1 --   \tauth\tauthsvr\scripts\tpostmarketpluginenabled_winscw.script, 1600, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pre_patchdata_negative.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_postmarketplugin.bat
 TESTEXECUTE, \logs\testexecute\tclientsidsupport.htm,, -Dstartupmode=1 --  \tauth\tauthsvr\scripts\tclientsidsupport.script, 1600, UDEB#UREL,,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_tclientsidsupport.bat
 TESTEXECUTE, \logs\testexecute\authsecuritytests.htm,, -Dstartupmode=1 --   \tauth\securitytests\scripts\authsecuritytests.script, 1600, UDEB#UREL,, \epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\post_tauthsvr.bat
-TESTEXECUTE, \logs\testexecute\tauthsvroom.htm,, -Dstartupmode=1 --   \tauth\tauthsvr\scripts\tauthsvroom.script, 5000, UDEB#UREL,,
-
+TESTEXECUTE, \logs\testexecute\tauthsvroom.htm,, -Dstartupmode=1 --  \tauth\tauthsvr\scripts\tauthsvroom.script, 5000, UDEB#UREL,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\pretauthsvroom.bat,\epoc32\winscw\c\tauth\tauthsvr\scripts\batchfiles\posttauthsvroom.bat
 # Pinplugin test
-TESTEXECUTE, \logs\testexecute\tpinplugin.htm,, \tauth\tpinplugin\scripts\tpinplugin.script, 300, UDEB,,
+TESTEXECUTE, \logs\testexecute\tpinplugin.htm,, -Dstartupmode=1 -- \tauth\tpinplugin\scripts\tpinplugin.script, 300, UDEB#UREL,,
 
 # Scan for unexpected panics in epocwind.out files
 PERL, \panicscanlog.txt,,\epoc32\winscw\c\tswi\panicscan_authserver.pl, 300, UDEB,,
 
 
 
-[StreamingCAF]
-#Streaming CAF Tests
-TESTEXECUTE, \logs\testexecute\tscaf.htm,,-Dtextshell --  z:\tcaf\tscaf\tscaf.script, 300, UDEB#UREL, ,
-TESTEXECUTE, \logs\testexecute\tscaf_oom.htm,,-Dtextshell --  z:\tcaf\tscaf\tscaf_oom.script, 300, UDEB, ,
-
 [USIF]
 #Universal Software Install Framework Tests
 TESTEXECUTE, \logs\testexecute\usifsecuritytests.htm,,z:\tusif\securitytests\usifsecuritytests.script, 300, UDEB#UREL,,
@@ -882,10 +718,14 @@
 
 [SecurityTools]
 # Security tools tests
-PERL, \security_tools\tcertapp\tCertapp_Output.txt,, \epoc32\winscw\c\security_tools\tcertapp\run_tcertapp.pl, 1600, UDEB#UREL,,
-t_certapps, \SDP-Security_Tools-CertApp-CCDAT-EMU00.log,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-CCDAT-EMU00.txt \SDP-Security_Tools-CertApp-CCDAT-EMU00.log, 300, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
-t_certstore, \SDP-Security_Tools-CertApp-FILEDAT-EMU00.log,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-FILEDAT-EMU00.txt \SDP-Security_Tools-CertApp-FILEDAT-EMU00.log, 600, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
-t_certstore, \SDP-Security_Tools-CertApp-SWIDAT-EMU00.log,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-SWIDAT-EMU00.txt \SDP-Security_Tools-CertApp-SWIDAT-EMU00.log, 600, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
+PERL, \security_tools\tcertapp\tCertapp_Output.htm,, \epoc32\winscw\c\security_tools\tcertapp\run_tcertapp.pl, 1600, UDEB#UREL,,
+t_certapps, \logs\testexecute\SDP-Security_Tools-CertApp-CCDAT-EMU00.htm,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-CCDAT-EMU00.script \logs\testexecute\SDP-Security_Tools-CertApp-CCDAT-EMU00.htm, 300, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
+t_certstore, \logs\testexecute\SDP-Security_Tools-CertApp-FILEDAT-EMU00.htm,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-FILEDAT-EMU00.script \logs\testexecute\SDP-Security_Tools-CertApp-FILEDAT-EMU00.htm, 600, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
+t_certstore, \logs\testexecute\SDP-Security_Tools-CertApp-SWIDAT-EMU00.htm,, -Dtextshell -- \security_tools\tcertapp\SDP-Security_Tools-CertApp-SWIDAT-EMU00.script \logs\testexecute\SDP-Security_Tools-CertApp-SWIDAT-EMU00.htm, 600, UDEB#UREL, \epoc32\winscw\c\security_tools\tcertapp\pre_tcertapp.bat, \epoc32\winscw\c\security_tools\tcertapp\post_tcertapp.bat
+
+[UptoMCL]
+# Scan for unexpected panics in epocwind.out files
+PERL, \panicscanlog.txt,,\epoc32\winscw\c\tswi\panicscan.pl, 300, UDEB,,
 
 
 [Misc]
@@ -897,9 +737,8 @@
 
 # Categorisation tags are checked for all of security sub-system 
 PERL, \searchtags.txt,,\epoc32\winscw\c\tswi\searchtags.pl, 300, UDEB,,
+[FileTokens_HwImpl]
+T_KEYSTORE, \logs\testexecute\thwkeystore.htm,,		     -Dstartupmode=1 -- \tkeystore\scripts\thwkeystore.script	\logs\testexecute\thwkeystore.htm,				300, UDEB#UREL, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\pre_dummyeccplugin.bat, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\post_dummyeccplugin.bat
+TESTEXECUTE, \logs\testexecute\te_dummyeccciphertestcases.htm,, -Dtextshell -- \testdata\tcryptospi\scripts\te_dummyeccciphertestcases.script, 900, UDEB#UREL, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\pre_dummyeccplugin.bat, \epoc32\winscw\c\testdata\tcryptospi\scripts\batchfiles\post_dummyeccplugin.bat
 
-[UptoMCL]
-# Scan for unexpected panics in epocwind.out files
-PERL, \panicscanlog.txt,,\epoc32\winscw\c\tswi\panicscan.pl, 300, UDEB,,
-# END of file
FCL/sf/os/security