diff --git a/test/list_test.cpp b/test/list_test.cpp
index bac1040..e756a91 100644
--- a/test/list_test.cpp
+++ b/test/list_test.cpp
@@ -443,28 +443,6 @@ class test_main_template< VoidPointer, false, Default_Holder >
       for (int i = 0; i < 5; ++i)
          data[i].value_ = i + 1;
 
-      make_and_test_list < typename detail::get_base_value_traits <
-                              value_type,
-                              typename hooks<VoidPointer>::base_hook_type
-                           >::type,
-                           false,
-                           Default_Holder,
-                           std::vector< value_type >
-                         >::test_all(data);
-      make_and_test_list < typename detail::get_member_value_traits <
-                              member_hook< value_type, typename hooks<VoidPointer>::member_hook_type, &value_type::node_>
-                           >::type,
-                           false,
-                           Default_Holder,
-                           std::vector< value_type >
-                         >::test_all(data);
-
-//      test_list<stateful_value_traits
-//                  < value_type
-//                  , list_node_traits<VoidPointer>
-//                  , safe_link>
-//               >::test_all(data);
-
       make_and_test_list < typename detail::get_base_value_traits <
                               value_type,
                               typename hooks<VoidPointer>::auto_base_hook_type
@@ -481,12 +459,6 @@ class test_main_template< VoidPointer, false, Default_Holder >
                          std::vector< value_type >
                        >::test_all(data);
 
-//      test_list<stateful_value_traits
-//                  < value_type
-//                  , list_node_traits<VoidPointer>
-//                  , auto_unlink>
-//               >::test_all(data);
-
       return 0;
    }
 };
diff --git a/test/slist_test.cpp b/test/slist_test.cpp
index 1857ae5..8a5362f 100644
--- a/test/slist_test.cpp
+++ b/test/slist_test.cpp
@@ -494,18 +494,6 @@ class test_main_template
                  , Default_Holder
                  , std::vector< value_type >
                 >::test_all(data);
-      make_and_test_slist < typename detail::get_member_value_traits
-                  < member_hook< value_type
-                               , typename hooks<VoidPointer>::member_hook_type
-                               , &value_type::node_
-                               >
-                  >::type
-                 , constant_time_size
-                 , false
-                 , false
-                 , Default_Holder
-                 , std::vector< value_type >
-                >::test_all(data);
       make_and_test_slist < nonhook_node_member_value_traits< value_type,
                                                      typename hooks<VoidPointer>::nonhook_node_member_type,
                                                      &value_type::nhn_member_,
@@ -519,17 +507,6 @@ class test_main_template
                 >::test_all(data);
 
       //Now linear slists
-      make_and_test_slist < typename detail::get_base_value_traits
-                  < value_type
-                  , typename hooks<VoidPointer>::base_hook_type
-                  >::type
-                 , constant_time_size
-                 , true
-                 , false
-                 , Default_Holder
-                 , std::vector< value_type >
-                >::test_all(data);
-
       make_and_test_slist < typename detail::get_member_value_traits
                   < member_hook< value_type
                                , typename hooks<VoidPointer>::member_hook_type
@@ -554,18 +531,6 @@ class test_main_template
                  , Default_Holder
                  , std::vector< value_type >
                 >::test_all(data);
-      make_and_test_slist < typename detail::get_member_value_traits
-                  < member_hook< value_type
-                               , typename hooks<VoidPointer>::member_hook_type
-                               , &value_type::node_
-                               >
-                  >::type
-                 , constant_time_size
-                 , false
-                 , true
-                 , Default_Holder
-                 , std::vector< value_type >
-                >::test_all(data);
 
       //Now linear slists
       make_and_test_slist < typename detail::get_base_value_traits
@@ -578,19 +543,6 @@ class test_main_template
                  , Default_Holder
                  , std::vector< value_type >
                 >::test_all(data);
-
-      make_and_test_slist < typename detail::get_member_value_traits
-                  < member_hook< value_type
-                               , typename hooks<VoidPointer>::member_hook_type
-                               , &value_type::node_
-                               >
-                  >::type
-                 , constant_time_size
-                 , true
-                 , true
-                 , Default_Holder
-                 , std::vector< value_type >
-                >::test_all(data);
       return 0;
    }
 };
@@ -606,30 +558,6 @@ class test_main_template<VoidPointer, false, Default_Holder>
       for (int i = 0; i < 5; ++i)
          data[i].value_ = i + 1;
 
-      make_and_test_slist < typename detail::get_base_value_traits
-                  < value_type
-                  , typename hooks<VoidPointer>::base_hook_type
-                  >::type
-                 , false
-                 , false
-                 , false
-                 , Default_Holder
-                 , std::vector< value_type >
-                >::test_all(data);
-
-      make_and_test_slist < typename detail::get_member_value_traits
-                  < member_hook< value_type
-                               , typename hooks<VoidPointer>::member_hook_type
-                               , &value_type::node_
-                               >
-                  >::type
-                 , false
-                 , false
-                 , false
-                 , Default_Holder
-                 , std::vector< value_type >
-                >::test_all(data);
-
       make_and_test_slist < typename detail::get_base_value_traits
                   < value_type
                   , typename hooks<VoidPointer>::auto_base_hook_type
@@ -641,48 +569,11 @@ class test_main_template<VoidPointer, false, Default_Holder>
                  , std::vector< value_type >
                 >::test_all(data);
 
-      make_and_test_slist < typename detail::get_member_value_traits
-                  < member_hook< value_type
-                               , typename hooks<VoidPointer>::auto_member_hook_type
-                               , &value_type::auto_node_
-                               >
-                  >::type
-                 , false
-                 , false
-                 , false
-                 , Default_Holder
-                 , std::vector< value_type >
-                >::test_all(data);
-
-      make_and_test_slist < typename detail::get_base_value_traits
-                  < value_type
-                  , typename hooks<VoidPointer>::base_hook_type
-                  >::type
-                 , false
-                 , true
-                 , false
-                 , Default_Holder
-                 , std::vector< value_type >
-                >::test_all(data);
-
-      make_and_test_slist < typename detail::get_member_value_traits
-                  < member_hook< value_type
-                               , typename hooks<VoidPointer>::member_hook_type
-                               , &value_type::node_
-                               >
-                  >::type
-                 , false
-                 , true
-                 , false
-                 , Default_Holder
-                 , std::vector< value_type >
-                >::test_all(data);
-
-      //Now cache last
-      make_and_test_slist < typename detail::get_base_value_traits
-                  < value_type
-                  , typename hooks<VoidPointer>::base_hook_type
-                  >::type
+      make_and_test_slist < nonhook_node_member_value_traits< value_type,
+                                                     typename hooks<VoidPointer>::nonhook_node_member_type,
+                                                     &value_type::nhn_member_,
+                                                     safe_link
+                                                   >
                  , false
                  , false
                  , true
@@ -697,8 +588,8 @@ class test_main_template<VoidPointer, false, Default_Holder>
                                >
                   >::type
                  , false
-                 , false
                  , true
+                 , false
                  , Default_Holder
                  , std::vector< value_type >
                 >::test_all(data);
@@ -714,18 +605,6 @@ class test_main_template<VoidPointer, false, Default_Holder>
                  , std::vector< value_type >
                 >::test_all(data);
 
-      make_and_test_slist < typename detail::get_member_value_traits
-                  < member_hook< value_type
-                               , typename hooks<VoidPointer>::member_hook_type
-                               , &value_type::node_
-                               >
-                  >::type
-                 , false
-                 , true
-                 , true
-                 , Default_Holder
-                 , std::vector< value_type >
-                >::test_all(data);
       return 0;
    }
 };