diff --git a/test/helpers/metafunctions.hpp b/test/helpers/metafunctions.hpp
index 88b00e66..c0c56e71 100644
--- a/test/helpers/metafunctions.hpp
+++ b/test/helpers/metafunctions.hpp
@@ -8,11 +8,7 @@
 
 #include <boost/config.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/identity.hpp>
 #include <boost/mpl/not.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/apply.hpp>
 #include <boost/unordered_set.hpp>
 #include <boost/unordered_map.hpp>
 
@@ -82,7 +78,8 @@ namespace test
 
     // Non Const Value Type
 
-    struct map_non_const_value_type
+    template <bool IsMap>
+    struct non_const_value_type_impl
     {
         template <class Container>
         struct apply {
@@ -92,7 +89,8 @@ namespace test
         };
     };
 
-    struct set_non_const_value_type
+    template<>
+    struct non_const_value_type_impl<false>
     {
         template <class Container>
         struct apply {
@@ -102,9 +100,8 @@ namespace test
     
     template <class Container>
     struct non_const_value_type
-        : boost::mpl::apply1<
-            BOOST_DEDUCED_TYPENAME boost::mpl::if_<is_map<Container>, map_non_const_value_type, set_non_const_value_type>::type,
-            Container>
+        : non_const_value_type_impl< ::test::is_map<Container>::value>::
+            BOOST_NESTED_TEMPLATE apply<Container>
     {
     };
 }
diff --git a/test/unordered/compile_tests.hpp b/test/unordered/compile_tests.hpp
index c44cd02c..d7843cdf 100644
--- a/test/unordered/compile_tests.hpp
+++ b/test/unordered/compile_tests.hpp
@@ -127,6 +127,11 @@ void container_test(X& r, T&)
     test::check_return_type<size_type>::equals(a.size());
     test::check_return_type<size_type>::equals(a.max_size());
     test::check_return_type<bool>::convertible(a.empty());
+
+    // Allocator
+
+    typedef BOOST_DEDUCED_TYPENAME X::allocator_type allocator_type;
+    test::check_return_type<allocator_type>::equals(a_const.get_allocator());
 }
 
 template <class X, class Key>
diff --git a/test/unordered/unnecessary_copy_tests.cpp b/test/unordered/unnecessary_copy_tests.cpp
index 1c713a6c..64039020 100644
--- a/test/unordered/unnecessary_copy_tests.cpp
+++ b/test/unordered/unnecessary_copy_tests.cpp
@@ -45,8 +45,13 @@ namespace unnecessary_copy_tests
         T x;
         BOOST_DEDUCED_TYPENAME T::value_type a;
         BOOST_CHECK(count_copies::count == 1);
+        if(count_copies::count != 1)
+            std::cerr<<count_copies::count<<" copies.\n";
+
         x.insert(a);
         BOOST_CHECK(count_copies::count == 2);
+        if(count_copies::count != 1)
+            std::cerr<<count_copies::count<<" copies.\n";
     }
 
     boost::unordered_set<count_copies>* set;