3 files changed, 5 insertions, 11 deletions

diff --git a/src/credential/Makefile.am b/src/credential/Makefile.am
index e85c3cc2d..47204ae26 100644
--- a/src/credential/Makefile.am
+++ b/src/credential/Makefile.am
@@ -103,8 +103,10 @@ libgnunetcredential_la_LDFLAGS = \
 # $(GN_PLUGIN_LDFLAGS)
 
 
-#check_SCRIPTS = \
-  #test_gns_lookup.sh 
+check_SCRIPTS = \
+  test_credential_issue.sh \
+        test_credential_verify_simple.sh \
+        test_credential_verify.sh
 
 if ENABLE_TEST_RUN
 if HAVE_SQLITE
diff --git a/src/credential/gnunet-service-credential.c b/src/credential/gnunet-service-credential.c
index bf85b1583..9f7b60f1f 100644
--- a/src/credential/gnunet-service-credential.c
+++ b/src/credential/gnunet-service-credential.c
@@ -526,14 +526,6 @@ handle_credential_query (void* cls,
       continue;
     cred_record_count++;
     crd = rd[i].data;
-    /**
-     * TODO:
-     * Check if we have already found our credential here
-     * If so return success
-     * Else
-     *  Save all found attributes/issues and prepare forward
-     *  resolution of issuer attribute
-     */
     if(GNUNET_OK != GNUNET_CRYPTO_ecdsa_verify(GNUNET_SIGNATURE_PURPOSE_CREDENTIAL, 
                                                &crd->purpose,
                                                &crd->sig,
diff --git a/src/credential/test_credential_verify_simple.sh b/src/credential/test_credential_verify_simple.sh
index 2fac4659e..924f2ab4a 100755
--- a/src/credential/test_credential_verify_simple.sh
+++ b/src/credential/test_credential_verify_simple.sh
@@ -19,7 +19,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f`
 
 
 which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
-#gnunet-arm -s -c test_credential_lookup.conf
+gnunet-arm -s -c test_credential_lookup.conf
 gnunet-identity -C testissuer -c test_credential_lookup.conf
 gnunet-identity -C testsubject -c test_credential_lookup.conf