diff --git a/src/lib/iter-adapter-stl.hpp b/src/lib/iter-adapter-stl.hpp
index 0e7a93a8e..ee7595e8c 100644
--- a/src/lib/iter-adapter-stl.hpp
+++ b/src/lib/iter-adapter-stl.hpp
@@ -153,7 +153,7 @@ namespace iter_stl {
     };
   
   /**
-   * Wrapped-Iter-Policy: picking the key part
+   * Wrapped-Iter-Policy: picking the value part
    * of a pair iterator (map or multimap).
    */
   template<typename IT>
diff --git a/tests/40core.tests b/tests/40core.tests
index 063202d21..ebd97101d 100644
--- a/tests/40core.tests
+++ b/tests/40core.tests
@@ -444,21 +444,21 @@ out: iter::eachKey::0::1::2::3::4::5::6::7::8::9
 out: iter::eachVal::0::2::4::6::8::10::12::14::16::18
 out: iter::eachDistinctKey::0::1::2::3::4::5::6::7::8::9
 out: -----iterateMapKeyVal---.+unordered_map
-out: iter::eachKey::0::1::2::3::4::5::6::7::8::9
-out: iter::eachVal::0::2::4::6::8::10::12::14::16::18
-out: iter::eachDistinctKey::0::1::2::3::4::5::6::7::8::9
+out: iter::eachKey::9::8::7::6::5::4::3::2::1::0
+out: iter::eachVal::18::16::14::12::10::8::6::4::2::0
+out: iter::eachDistinctKey::9::8::7::6::5::4::3::2::1::0
 out: -----iterateMapKeyVal---.+multimap
 out: iter::eachKey::0::0::0::0::0::0::0::0::0::0::1::1::1::1::1::1::1::1::1::2::2::2::2::2::2::2::2::3::3::3::3::3::3::3::4::4::4::4::4::4::5::5::5::5::5::6::6::6::6::7::7::7::8::8::9
 out: iter::eachVal::10::9::8::7::6::5::4::3::2::1::9::8::7::6::5::4::3::2::1::8::7::6::5::4::3::2::1::7::6::5::4::3::2::1::6::5::4::3::2::1::5::4::3::2::1::4::3::2::1::3::2::1::2::1::1
 out: iter::eachDistinctKey::0::1::2::3::4::5::6::7::8::9
 out: -----iterateMapKeyVal---.+unordered_multimap
-out: iter::eachKey::0::0::0::0::0::0::0::0::0::0::1::1::1::1::1::1::1::1::1::2::2::2::2::2::2::2::2::3::3::3::3::3::3::3::4::4::4::4::4::4::5::5::5::5::5::6::6::6::6::7::7::7::8::8::9
-out: iter::eachVal::9::8::7::6::5::4::3::2::1::10::9::1::2::3::4::5::6::7::8::8::5::6::4::3::2::1::7::6::5::4::3::2::1::7::5::4::3::2::1::6::4::3::2::1::5::3::1::2::4::3::1::2::2::1::1
-out: iter::eachDistinctKey::0::1::2::3::4::5::6::7::8::9
+out: iter::eachKey::9::8::8::2::2::2::2::2::2::2::2::1::1::1::1::1::1::1::1::1::0::0::0::0::0::0::0::0::0::0::3::3::3::3::3::3::3::4::4::4::4::4::4::5::5::5::5::5::6::6::6::6::7::7::7
+out: iter::eachVal::1::1::2::1::2::3::4::5::6::7::8::1::2::3::4::5::6::7::8::9::1::2::3::4::5::6::7::8::9::10::1::2::3::4::5::6::7::1::2::3::4::5::6::1::2::3::4::5::1::2::3::4::1::2::3
+out: iter::eachDistinctKey::9::8::2::1::0::3::4::5::6::7
 out: -----iterateValues4Key---.+multimap
 out: iter::eachValForKey::10::9::8::7::6::5::4::3::2::1
 out: -----iterateValues4Key---.+unordered_multimap
-out: iter::eachValForKey::9::8::7::6::5::4::3::2::1::10
+out: iter::eachValForKey::1::2::3::4::5::6::7::8::9::10
 out: snapshot-0-1-2-3-4-5-6-7-8-9
 out: snapshot-22-44
 END
@@ -487,7 +487,7 @@ out: (::X...........){13}$
 out: (::0:0.:..\..00){13}$
 out: distinct_keys::0::1::2::3::4::5::6::7::8::9::10::11::12
 out: values_4_key(::[0-9]{1,2})+
-out: distinct_keys::0::1::2::3::4::5::6::7::8::9::10::11::12
+out: distinct_keys(::[0-9]{1,2}){13}
 out: values_4_key(::[0-9]{1,2})+
 END
 
diff --git a/tests/library/iter-adapter-stl-test.cpp b/tests/library/iter-adapter-stl-test.cpp
index d73ef5e34..7169b350b 100644
--- a/tests/library/iter-adapter-stl-test.cpp
+++ b/tests/library/iter-adapter-stl-test.cpp
@@ -82,6 +82,10 @@ namespace test{
    * @see RangeIter
    * @see iter-adapter.hpp
    * @see iter-adapter-stl.hpp
+   * @todo this test just pulls all the values from the iterator
+   *       and the testsuite verifies the retrieved values.
+   *       But for the hash-map, the order of the results
+   *       is not guaranteed, and implementation dependent.
    */
   class IterAdapterSTL_test : public Test
     {
diff --git a/tests/library/iter-source-test.cpp b/tests/library/iter-source-test.cpp
index f91b2d81f..019f8c80a 100644
--- a/tests/library/iter-source-test.cpp
+++ b/tests/library/iter-source-test.cpp
@@ -146,6 +146,8 @@ namespace test{
    *        
    * @see IterSource
    * @see PlacementIndex::Table#_eachEntry_4check real world usage example
+   * @todo the output order of the values produced by this test
+   *       is implementation dependent in for the hashmap case
    */
   class IterSource_test : public Test
     {