Index: adapter/org/etsi/its/adapter/TestAdapter.java
===================================================================
--- adapter/org/etsi/its/adapter/TestAdapter.java	(revision 2612)
+++ adapter/org/etsi/its/adapter/TestAdapter.java	(working copy)
@@ -20,7 +20,6 @@
 import org.etsi.its.adapter.ports.ProtocolPortFactory;
 import org.etsi.its.adapter.ports.UpperTesterPort;
 import org.etsi.ttcn.tci.CharstringValue;
-import org.etsi.ttcn.tri.TriActionTemplate;
 import org.etsi.ttcn.tri.TriAddress;
 import org.etsi.ttcn.tri.TriAddressList;
 import org.etsi.ttcn.tri.TriCommunicationSA;
@@ -74,7 +73,6 @@
     /* (non-Javadoc)
      * @see org.etsi.ttcn.tri.TriCommunicationSA#triExecuteTestcase(org.etsi.ttcn.tri.TriTestCaseId, org.etsi.ttcn.tri.TriPortIdList)
      */
-    @Override
     public TriStatus triExecuteTestcase(final TriTestCaseId tcId, final TriPortIdList portList) {
         return required.getTriStatus(TriStatus.TRI_OK);
     } 
@@ -303,15 +301,6 @@
     }
 
     /**
-     * triSutActionTemplate not implemented
-     * @see org.etsi.ttcn.tri.TriCommunicationSA#triSutActionTemplate(org.etsi.ttcn.tri.TriActionTemplate)
-     */
-    @Override
-    public TriStatus triSutActionTemplate(TriActionTemplate templateValue) {
-        return required.getTriStatus(TriStatus.TRI_ERROR, "triSutActionTemplate not implemented");
-    }
-
-    /**
      * triMapParam not implemented
      * @see org.etsi.ttcn.tri.TriCommunicationSA#triMapParam(org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriParameterList)
      */
@@ -328,4 +317,28 @@
     public TriStatus triUnmapParam(TriPortId compPortId, TriPortId tsiPortId, TriParameterList paramList) {
         return required.getTriStatus(TriStatus.TRI_ERROR, "triUnmapParam not implemented");
     }
+
+    @Override
+    public TriStatus triExecuteTestCase(TriTestCaseId arg0, TriPortIdList arg1) {
+        // TODO Auto-generated method stub
+        return triExecuteTestcase(arg0, arg1);
+    }
+
+    @Override
+    public TriStatus triGetStreamValue(TriComponentId arg0, TriPortId arg1, TriAddress arg2, TriMessage arg3) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public TriStatus triSetStreamValue(TriComponentId arg0, TriPortId arg1, TriAddress arg2, TriMessage arg3) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public TriStatus triStaticMap(TriPortId arg0, TriPortId arg1) {
+        // TODO Auto-generated method stub
+        return null;
+    }
 } 
Index: certificatesio/org/etsi/certificates/io/CertificatesIO.java
===================================================================
--- certificatesio/org/etsi/certificates/io/CertificatesIO.java	(revision 2612)
+++ certificatesio/org/etsi/certificates/io/CertificatesIO.java	(working copy)
@@ -149,7 +149,7 @@
      */
     @Override
     public boolean readCertificate(final String key, final ByteArrayOutputStream certificate) {
-//        TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificate: " + key);
+        TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificate: " + key);
         
         String certKey;
         if (_cachedReverseCertificatesDigest.containsKey(key)) {
@@ -173,7 +173,7 @@
     
     @Override
     public boolean readCertificateDigest(final String certificateId, final ByteArrayOutputStream digest) {
-//        TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificateDigest: " + certificateId);
+        TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificateDigest: " + certificateId);
         
         // Sanity check
         if (!_cachedCertificatesDigest.containsKey(certificateId)) {
@@ -199,7 +199,7 @@
      */
     @Override
     public boolean readSigningKey(final String keyName, final ByteArrayOutputStream key) { 
-//        TERFactory.getInstance().logDebug(">>> CertificatesIO.readSigningKey: " + keyName);
+        TERFactory.getInstance().logDebug(">>> CertificatesIO.readSigningKey: " + keyName);
         
         try {
             String certKey;
@@ -305,11 +305,11 @@
             return;
         }
         _cachedCertificatesDigest.put(certName, bytes);
-//        TERFactory.getInstance().logDebug("CertificatesIO.addDigestItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
+        TERFactory.getInstance().logDebug("CertificatesIO.addDigestItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
     }
     
     private void addCertItem(final File p_certFile)  throws FileNotFoundException, IOException {
-//        TERFactory.getInstance().logDebug(">>> CertificatesIO.addItem: " + p_certFile);
+        TERFactory.getInstance().logDebug(">>> CertificatesIO.addCertItem: " + p_certFile);
         
         // Load the keys file name
         String filename = p_certFile.getName();
@@ -322,14 +322,14 @@
         fsKeys.close();
         bytes = ByteHelper.hexStringToByteArray(new String(bytes));
         _cachedCertificates.put(certName, bytes);
-//        TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store cert " + certName + " - " + ByteHelper.byteArrayToString(bytes));
+        TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store cert " + certName + " - " + ByteHelper.byteArrayToString(bytes));
         
         // calculate digest
         bytes = calculateDigestFromCertificate(bytes);
         _cachedCertificatesDigest.put(certName, bytes);
-//        TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
+        TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
         _cachedReverseCertificatesDigest.put(ByteHelper.byteArrayToString(bytes), certName);
-//        TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store reverse digest " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
+        TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store reverse digest " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
         
         // Load Private Keys
         filename = p_certFile.getPath();
Index: codec/org/etsi/ttcn/codec/CodecFactory.java
===================================================================
--- codec/org/etsi/ttcn/codec/CodecFactory.java	(revision 2612)
+++ codec/org/etsi/ttcn/codec/CodecFactory.java	(working copy)
@@ -83,7 +83,7 @@
         if(codec != null) {
             //TERFactory.getInstance().logDebug(String.format("%50s", encoding));
             //TERFactory.getInstance().logDebug(" ==> " + codec.getClass().getName());
-            System.out.println(String.format("%50s", encoding) + " ==> " + codec.getClass().getName());
+            //System.out.println(String.format("%50s", encoding) + " ==> " + codec.getClass().getName());
             return codec;
         }
         return null;
@@ -92,12 +92,12 @@
     public ICodec getCodec(MainCodec mainCodec, int classType, String encoding, String typeName) {
 
         //TERFactory.getInstance().logDebug(String.format("%50s", typeName + "(" + encoding + ")"));
-        System.out.println(String.format("%50s", typeName + "(" + encoding + ")"));
+//        System.out.println(String.format("%50s", typeName + "(" + encoding + ")"));
         Class<? extends ICodec> cls = null;
         Class<?>[] ctorParams = {MainCodec.class};
 
         //TERFactory.getInstance().logDebug("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
-        System.out.println("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
+//        System.out.println("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
         cls = codecs.get(classType + '/' + encoding + '/' + typeName);
         if(cls == null) {
             cls = codecs.get(classType + '/' + encoding + '/');
@@ -108,7 +108,7 @@
 
         if(cls != null) {
             //TERFactory.getInstance().logDebug(" ==> " + cls.getName());
-            System.out.println(" ==> " + cls.getName());
+            //System.out.println(" ==> " + cls.getName());
             try {
                 Constructor<? extends ICodec> ctor = cls.getConstructor(ctorParams);
                 return ctor.newInstance(mainCodec);
Index: codec/org/etsi/ttcn/codec/MainCodec.java
===================================================================
--- codec/org/etsi/ttcn/codec/MainCodec.java	(revision 2612)
+++ codec/org/etsi/ttcn/codec/MainCodec.java	(working copy)
@@ -67,6 +67,8 @@
 
     @Override
     public CodecBuffer encode(Value value) {
+        //TERFactory.getInstance().logDebug(">>> MainCodec.encode: " + value);
+        //System.out.println(">>> MainCodec.encode: " + value);
         
         CodecFactory cf = CodecFactory.getInstance();
         TciCDProvided extCodec = cf.getExternalCodec(value.getValueEncoding());