diff --git a/modules/mol/base/tests/CMakeLists.txt b/modules/mol/base/tests/CMakeLists.txt
index b29f1128e67b23fae8b469437195fb80a40b7cbe..e5d1c868ca25f6b2d138e176b37ea71b806458f8 100644
--- a/modules/mol/base/tests/CMakeLists.txt
+++ b/modules/mol/base/tests/CMakeLists.txt
@@ -17,3 +17,6 @@ set(OST_MOL_BASE_UNIT_TESTS
 
 ost_unittest(mol "${OST_MOL_BASE_UNIT_TESTS}")
 
+# for valgrind debugging
+# executable(NAME test_query_standalone SOURCES test_query_standalone.cc DEPENDS_ON mol)
+
diff --git a/modules/mol/base/tests/test_query.cc b/modules/mol/base/tests/test_query.cc
index b41ae5db0f17e2618681415b0d443b8b6b039cf1..0e474611a6491239d6b3dc212bce5720250a6961 100644
--- a/modules/mol/base/tests/test_query.cc
+++ b/modules/mol/base/tests/test_query.cc
@@ -279,7 +279,8 @@ BOOST_AUTO_TEST_CASE(test_glob)
   ensure_counts(e, "rname=ARG and aname=N?1", 1, 1, 1);
   ensure_counts(e, "rname=ARG and aname=NH?", 1, 1, 2);
   ensure_counts(e, "rname=ARG and aname=\"*2\"", 1, 1, 1);
-  //ensure_counts(e, "rname=ARG and aname=N?", 1, 1, 1);
+  ensure_counts(e, "rname=ARG and aname=N?", 1, 1, 1);
+  ensure_counts(e, "rname=LEU and aname=\"?D?\"", 1, 1, 2);
 }
 
 BOOST_AUTO_TEST_SUITE_END()