diff --git a/test/adaptor_test/type_erased.cpp b/test/adaptor_test/type_erased.cpp
index a697c52..fd3ee5f 100644
--- a/test/adaptor_test/type_erased.cpp
+++ b/test/adaptor_test/type_erased.cpp
@@ -22,448 +22,442 @@
 
 namespace boost_range_adaptor_type_erased_test
 {
-    namespace
+    class MockType
     {
-        class MockType
+    public:
+        MockType()
+            : m_x(0)
         {
-        public:
-            explicit MockType(int x)
-                : m_x(x) {}
-
-            int get() const { return m_x; }
-
-            bool operator==(const MockType& other) const
-            {
-                return m_x == other.m_x;
-            }
-
-            bool operator!=(const MockType& other) const
-            {
-                return m_x != other.m_x;
-            }
-
-        private:
-            int m_x;
-        };
-
-        std::ostream& operator<<(std::ostream& out, const MockType& obj)
-        {
-            out << obj.get();
-            return out;
         }
 
-        template<class Container>
-        void test_type_erased_impl(Container& c)
+        MockType(int x)
+            : m_x(x)
         {
-            using namespace boost::adaptors;
-            typedef typename boost::range_value<Container>::type value_type;
-            typedef typename boost::adaptors::type_erased<> type_erased_t;
-
-
-            std::vector<value_type> output;
-
-            boost::push_back(output, boost::adaptors::type_erase(c, type_erased_t()));
-
-            BOOST_CHECK_EQUAL_COLLECTIONS( output.begin(), output.end(),
-                                           c.begin(), c.end() );
-
-            output.clear();
-            boost::push_back(output, c | type_erased_t());
-
-            BOOST_CHECK_EQUAL_COLLECTIONS( output.begin(), output.end(),
-                                           c.begin(), c.end() );
         }
 
-        template<class Container>
-        void test_const_and_mutable(Container& c)
-        {
-            test_type_erased_impl(c);
+        int get() const { return m_x; }
 
-            const Container& const_c = c;
-            test_type_erased_impl(const_c);
+        inline bool operator==(const MockType& other) const
+        {
+            return m_x == other.m_x;
         }
 
-        template<class Container>
-        void test_driver()
+        inline bool operator!=(const MockType& other) const
         {
-            using namespace boost::assign;
-
-            typedef typename boost::range_value<Container>::type value_type;
-
-            Container c;
-            test_const_and_mutable(c);
-
-            c += value_type(1);
-            test_const_and_mutable(c);
-
-            c += value_type(2);
-            test_const_and_mutable(c);
+            return m_x != other.m_x;
         }
 
-        void test_type_erased()
-        {
-            test_driver< std::list<int> >();
-            test_driver< std::vector<int> >();
+    private:
+        int m_x;
+    };
 
-            test_driver< std::list<MockType> >();
-            test_driver< std::vector<MockType> >();
+    inline std::ostream& operator<<(std::ostream& out, const MockType& obj)
+    {
+        out << obj.get();
+        return out;
+    }
+
+    template<class Container>
+    void test_type_erased_impl(Container& c)
+    {
+        using namespace boost::adaptors;
+        typedef typename boost::range_value<Container>::type value_type;
+        typedef typename boost::adaptors::type_erased<> type_erased_t;
+
+
+        std::vector<value_type> output;
+
+        boost::push_back(output, boost::adaptors::type_erase(c, type_erased_t()));
+
+        BOOST_CHECK_EQUAL_COLLECTIONS( output.begin(), output.end(),
+                                       c.begin(), c.end() );
+
+        output.clear();
+        boost::push_back(output, c | type_erased_t());
+
+        BOOST_CHECK_EQUAL_COLLECTIONS( output.begin(), output.end(),
+                                       c.begin(), c.end() );
+    }
+
+    template<class Container>
+    void test_const_and_mutable(Container& c)
+    {
+        test_type_erased_impl(c);
+
+        const Container& const_c = c;
+        test_type_erased_impl(const_c);
+    }
+
+    template<class Container>
+    void test_driver()
+    {
+        using namespace boost::assign;
+
+        typedef typename boost::range_value<Container>::type value_type;
+
+        Container c;
+        test_const_and_mutable(c);
+
+        c += value_type(1);
+        test_const_and_mutable(c);
+
+        c += value_type(2);
+        test_const_and_mutable(c);
+    }
+
+    void test_type_erased()
+    {
+        test_driver< std::list<int> >();
+        test_driver< std::vector<int> >();
+
+        test_driver< std::list<MockType> >();
+        test_driver< std::vector<MockType> >();
+    }
+
+    template<
+        class Traversal
+      , class Container
+    >
+    void test_writeable(Container&, boost::single_pass_traversal_tag)
+    {}
+
+    template<
+        class Traversal
+      , class Container
+    >
+    void test_writeable(Container& source, boost::forward_traversal_tag)
+    {
+        using namespace boost::adaptors;
+
+        typedef typename boost::range_value<Container>::type value_type;
+        typedef typename boost::range_difference<Container>::type difference_type;
+        typedef typename boost::range_reference<Container>::type mutable_reference_type;
+        typedef boost::any_range<
+                    value_type
+                  , Traversal
+                  , mutable_reference_type
+                  , difference_type
+                > mutable_any_range;
+
+        mutable_any_range r = source | boost::adaptors::type_erased<>();
+        std::vector<value_type> output_test;
+        boost::fill(r, value_type(1));
+        BOOST_CHECK_EQUAL( boost::distance(r), boost::distance(source) );
+        std::vector<value_type> reference_output(source.size(), value_type(1));
+        BOOST_CHECK_EQUAL_COLLECTIONS( reference_output.begin(), reference_output.end(),
+                                       r.begin(), r.end() );
+
+    }
+
+    template<
+        class Container
+      , class Traversal
+      , class Buffer
+    >
+    void test_type_erased_impl()
+    {
+        using namespace boost::adaptors;
+
+        typedef Buffer buffer_type;
+
+        typedef typename boost::range_value<Container>::type value_type;
+
+        typedef typename boost::any_range_type_generator<
+            Container
+          , boost::use_default
+          , Traversal
+          , boost::use_default
+          , boost::use_default
+          , Buffer
+        >::type mutable_any_range;
+
+        typedef typename boost::any_range_type_generator<
+            const Container
+          , boost::use_default
+          , Traversal
+          , boost::use_default
+          , boost::use_default
+          , Buffer
+        >::type const_any_range;
+
+        typedef boost::adaptors::type_erased<
+                    boost::use_default
+                  , Traversal
+                  , boost::use_default
+                  , boost::use_default
+                  , Buffer
+                > type_erased_t;
+
+        Container source;
+        for (int i = 0; i < 10; ++i)
+            source.push_back(value_type(i));
+
+        mutable_any_range r(source);
+        BOOST_CHECK_EQUAL_COLLECTIONS( source.begin(), source.end(),
+                                       r.begin(), r.end() );
+
+        r = mutable_any_range();
+        BOOST_CHECK_EQUAL( r.empty(), true );
+
+        r = source | type_erased_t();
+        BOOST_CHECK_EQUAL_COLLECTIONS( source.begin(), source.end(),
+                                       r.begin(), r.end() );
+        r = mutable_any_range();
+
+        r = boost::adaptors::type_erase(source, type_erased_t());
+        BOOST_CHECK_EQUAL_COLLECTIONS( source.begin(), source.end(),
+                                       r.begin(), r.end() );
+        r = mutable_any_range();
+
+        test_writeable<Traversal>(source, Traversal());
+
+        // convert and construct a const any_range from a mutable source
+        // range
+        const_any_range cr(source);
+        BOOST_CHECK_EQUAL_COLLECTIONS( source.begin(), source.end(),
+                                       cr.begin(), cr.end() );
+        // assign an empty range and ensure that this correctly results
+        // in an empty range. This is important for the validity of
+        // the rest of the tests.
+        cr = const_any_range();
+        BOOST_CHECK_EQUAL( cr.empty(), true );
+
+        // Test the pipe type_erased adaptor from a constant source
+        // range to a constant any_range
+        const Container& const_source = source;
+        cr = const_any_range();
+        cr = const_source | type_erased_t();
+        BOOST_CHECK_EQUAL_COLLECTIONS( const_source.begin(), const_source.end(),
+                                       cr.begin(), cr.end() );
+
+        // Test the pipe type erased adaptor from a mutable source
+        // range to a constant any_range
+        cr = const_any_range();
+        cr = source | type_erased_t();
+        BOOST_CHECK_EQUAL_COLLECTIONS( source.begin(), source.end(),
+                                       cr.begin(), cr.end() );
+
+        // Use the function form of the type_erase adaptor from a constant
+        // source range
+        cr = const_any_range();
+        cr = boost::adaptors::type_erase(const_source, type_erased_t());
+        BOOST_CHECK_EQUAL_COLLECTIONS( const_source.begin(), const_source.end(),
+                                       cr.begin(), cr.end() );
+
+        // Assignment from mutable to const...
+        cr = const_any_range();
+        cr = r;
+        BOOST_CHECK_EQUAL_COLLECTIONS( cr.begin(), cr.end(),
+                                       r.begin(), r.end() );
+
+        // Converting copy from mutable to const...
+        cr = const_any_range();
+        cr = const_any_range(r);
+        BOOST_CHECK_EQUAL_COLLECTIONS( cr.begin(), cr.end(),
+                                       r.begin(), r.end() );
+    }
+
+    template<
+        class Container
+      , class Traversal
+      , class Buffer
+    >
+    class test_type_erased_impl_fn
+    {
+    public:
+        typedef void result_type;
+        void operator()()
+        {
+            test_type_erased_impl< Container, Traversal, Buffer >();
         }
+    };
 
-        template<
-            class Traversal
-          , class Container
-        >
-        void test_writeable(Container&, boost::single_pass_traversal_tag)
-        {}
+    template<
+        class Container
+      , class Traversal
+    >
+    void test_type_erased_exercise_buffer_types()
+    {
+        using boost::any_iterator_default_buffer;
+        using boost::any_iterator_buffer;
+        using boost::any_iterator_heap_only_buffer;
+        using boost::any_iterator_stack_only_buffer;
 
-        template<
-            class Traversal
-          , class Container
-        >
-        void test_writeable(Container& source, boost::forward_traversal_tag)
+        test_type_erased_impl_fn< Container, Traversal, any_iterator_default_buffer >()();
+        test_type_erased_impl_fn< Container, Traversal, any_iterator_heap_only_buffer >()();
+        test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<1> >()();
+        test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<2> >()();
+        test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<32> >()();
+        test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<64> >()();
+        test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<128> >()();
+        test_type_erased_impl_fn< Container, Traversal, any_iterator_stack_only_buffer<128> >()();
+    }
+
+    void test_type_erased_single_pass()
+    {
+        test_type_erased_exercise_buffer_types< std::list<int>, boost::single_pass_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::deque<int>, boost::single_pass_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::vector<int>, boost::single_pass_traversal_tag >();
+
+        test_type_erased_exercise_buffer_types< std::list<MockType>, boost::single_pass_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::single_pass_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::single_pass_traversal_tag >();
+    }
+
+    void test_type_erased_forward()
+    {
+        test_type_erased_exercise_buffer_types< std::list<int>, boost::forward_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::deque<int>, boost::forward_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::vector<int>, boost::forward_traversal_tag >();
+
+        test_type_erased_exercise_buffer_types< std::list<MockType>, boost::forward_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::forward_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::forward_traversal_tag >();
+    }
+
+    void test_type_erased_bidirectional()
+    {
+        test_type_erased_exercise_buffer_types< std::list<int>, boost::bidirectional_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::deque<int>, boost::bidirectional_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::vector<int>, boost::bidirectional_traversal_tag >();
+
+        test_type_erased_exercise_buffer_types< std::list<MockType>, boost::bidirectional_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::bidirectional_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::bidirectional_traversal_tag >();
+    }
+
+    void test_type_erased_random_access()
+    {
+        test_type_erased_exercise_buffer_types< std::deque<int>, boost::random_access_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::vector<int>, boost::random_access_traversal_tag >();
+
+        test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::random_access_traversal_tag >();
+        test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::random_access_traversal_tag >();
+    }
+
+    void test_type_erased_multiple_different_template_parameter_conversion()
+    {
+        typedef boost::any_range<
+                    int
+                  , boost::random_access_traversal_tag
+                  , int&
+                  , std::ptrdiff_t
+        > source_range_type;
+
+        typedef boost::any_range<
+                    int
+                  , boost::single_pass_traversal_tag
+                  , const int&
+                  , std::ptrdiff_t
+        > target_range_type;
+
+        source_range_type source;
+
+        // Converting via construction
+        target_range_type t1(source);
+
+        // Converting via assignment
+        target_range_type t2;
+        t2 = source;
+
+        // Converting via construction to a type with a reference type
+        // that is a value
+        typedef boost::any_range<
+                    int
+                  , boost::single_pass_traversal_tag
+                  , int
+                  , std::ptrdiff_t
+                > target_range2_type;
+
+        target_range2_type t3(source);
+        target_range2_type t4;
+        t4 = source;
+    }
+
+    template<
+        class Traversal
+      , class ValueType
+      , class SourceValueType
+      , class SourceReference
+      , class TargetValueType
+      , class TargetReference
+    >
+    void test_type_erased_mix_values_impl()
+    {
+        typedef std::vector< ValueType > Container;
+
+        typedef typename boost::any_range_type_generator<
+            Container
+          , SourceValueType
+          , Traversal
+          , SourceReference
+        >::type source_type;
+
+        typedef typename boost::any_range_type_generator<
+            Container
+          , TargetValueType
+          , Traversal
+          , TargetReference
+        >::type target_type;
+
+        Container test_data;
+        for (int i = 0; i < 10; ++i)
+            test_data.push_back(i);
+
+        const source_type source_data(test_data);
+        target_type t1(source_data);
+        BOOST_CHECK_EQUAL_COLLECTIONS( source_data.begin(), source_data.end(),
+                                       t1.begin(), t1.end() );
+
+        target_type t2;
+        t2 = source_data;
+        BOOST_CHECK_EQUAL_COLLECTIONS( source_data.begin(), source_data.end(),
+                                       t2.begin(), t2.end() );
+    }
+
+    template<class Traversal>
+    void test_type_erased_mix_values_driver()
+    {
+        test_type_erased_mix_values_impl< Traversal, int, char, const int&, short, const int& >();
+        test_type_erased_mix_values_impl< Traversal, int, int*, const int&, char, const int& >();
+        test_type_erased_mix_values_impl< Traversal, MockType, char, const MockType&, short, const MockType& >();
+
+        // In fact value type should have no effect in the eligibility
+        // for conversion, hence we should be able to convert it
+        // completely backwards!
+        test_type_erased_mix_values_impl< Traversal, int, short, const int&, char, const int& >();
+        test_type_erased_mix_values_impl< Traversal, int, char, const int&, int*, const int& >();
+    }
+
+    void test_type_erased_mix_values()
+    {
+        test_type_erased_mix_values_driver< boost::single_pass_traversal_tag >();
+        test_type_erased_mix_values_driver< boost::forward_traversal_tag >();
+        test_type_erased_mix_values_driver< boost::bidirectional_traversal_tag >();
+        test_type_erased_mix_values_driver< boost::random_access_traversal_tag >();
+    }
+
+    void test_type_erased_operator_brackets()
+    {
+        typedef boost::adaptors::type_erased<> type_erased_t;
+
+        std::vector<int> c;
+        for (int i = 0; i < 10; ++i)
+            c.push_back(i);
+
+        typedef boost::any_range<
+            int
+          , boost::random_access_traversal_tag
+          , int
+          , boost::range_difference< std::vector<int> >::type
+          , boost::use_default
+        > any_range_type;
+
+        any_range_type rng = c | type_erased_t();
+
+        for (int i = 0; i < 10; ++i)
         {
-            using namespace boost::adaptors;
-
-            typedef typename boost::range_value<Container>::type value_type;
-            typedef typename boost::range_difference<Container>::type difference_type;
-            typedef typename boost::range_reference<Container>::type mutable_reference_type;
-            typedef boost::any_range<
-                        value_type
-                      , Traversal
-                      , mutable_reference_type
-                      , difference_type
-                    > mutable_any_range;
-
-            mutable_any_range r = source | boost::adaptors::type_erased<>();
-            std::vector<value_type> output_test;
-            boost::fill(r, value_type(1));
-            BOOST_CHECK_EQUAL( boost::distance(r), boost::distance(source) );
-            std::vector<value_type> reference_output(source.size(), value_type(1));
-            BOOST_CHECK_EQUAL_COLLECTIONS( reference_output.begin(), reference_output.end(),
-                                           r.begin(), r.end() );
-
-        }
-
-        template<
-            class Container
-          , class Traversal
-          , class Buffer
-        >
-        void test_type_erased_impl()
-        {
-            using namespace boost::adaptors;
-
-            typedef Buffer buffer_type;
-
-            typedef typename boost::range_value<Container>::type value_type;
-
-            typedef typename boost::any_range_type_generator<
-                Container
-              , boost::use_default
-              , Traversal
-              , boost::use_default
-              , boost::use_default
-              , Buffer
-            >::type mutable_any_range;
-
-            typedef typename boost::any_range_type_generator<
-                const Container
-              , boost::use_default
-              , Traversal
-              , boost::use_default
-              , boost::use_default
-              , Buffer
-            >::type const_any_range;
-
-            typedef boost::adaptors::type_erased<
-                        boost::use_default
-                      , Traversal
-                      , boost::use_default
-                      , boost::use_default
-                      , Buffer
-                    > type_erased_t;
-
-            type_erased_t type_erased_ex;
-
-            Container source;
-            for (int i = 0; i < 100; ++i)
-                source.push_back(value_type(i));
-
-            mutable_any_range r(source);
-            BOOST_CHECK_EQUAL_COLLECTIONS( source.begin(), source.end(),
-                                           r.begin(), r.end() );
-
-            r = mutable_any_range();
-            BOOST_CHECK_EQUAL( r.empty(), true );
-
-            r = source | type_erased_ex;
-            BOOST_CHECK_EQUAL_COLLECTIONS( source.begin(), source.end(),
-                                           r.begin(), r.end() );
-            r = mutable_any_range();
-
-            r = boost::adaptors::type_erase(source, type_erased_ex);
-            BOOST_CHECK_EQUAL_COLLECTIONS( source.begin(), source.end(),
-                                           r.begin(), r.end() );
-            r = mutable_any_range();
-
-            test_writeable<Traversal>(source, Traversal());
-
-            // convert and construct a const any_range from a mutable source
-            // range
-            const_any_range cr(source);
-            BOOST_CHECK_EQUAL_COLLECTIONS( source.begin(), source.end(),
-                                           cr.begin(), cr.end() );
-            // assign an empty range and ensure that this correctly results
-            // in an empty range. This is important for the validity of
-            // the rest of the tests.
-            cr = const_any_range();
-            BOOST_CHECK_EQUAL( cr.empty(), true );
-
-            // Test the pipe type_erased adaptor from a constant source
-            // range to a constant any_range
-            const Container& const_source = source;
-            cr = const_any_range();
-            cr = const_source | type_erased_ex;
-            BOOST_CHECK_EQUAL_COLLECTIONS( const_source.begin(), const_source.end(),
-                                           cr.begin(), cr.end() );
-
-            // Test the pipe type erased adaptor from a mutable source
-            // range to a constant any_range
-            cr = const_any_range();
-            cr = source | type_erased_ex;
-            BOOST_CHECK_EQUAL_COLLECTIONS( source.begin(), source.end(),
-                                           cr.begin(), cr.end() );
-
-            // Use the function form of the type_erase adaptor from a constant
-            // source range
-            cr = const_any_range();
-            cr = boost::adaptors::type_erase(const_source, type_erased_ex);
-            BOOST_CHECK_EQUAL_COLLECTIONS( const_source.begin(), const_source.end(),
-                                           cr.begin(), cr.end() );
-
-            // Assignment from mutable to const...
-            cr = const_any_range();
-            cr = r;
-            BOOST_CHECK_EQUAL_COLLECTIONS( cr.begin(), cr.end(),
-                                           r.begin(), r.end() );
-
-            // Converting copy from mutable to const...
-            cr = const_any_range();
-            cr = const_any_range(r);
-            BOOST_CHECK_EQUAL_COLLECTIONS( cr.begin(), cr.end(),
-                                           r.begin(), r.end() );
-        }
-
-        template<
-            class Container
-          , class Traversal
-          , class Buffer
-        >
-        class test_type_erased_impl_fn
-        {
-        public:
-            typedef void result_type;
-            void operator()()
-            {
-                test_type_erased_impl< Container, Traversal, Buffer >();
-            }
-        };
-
-        template<
-            class Container
-          , class Traversal
-        >
-        void test_type_erased_exercise_buffer_types()
-        {
-            using boost::any_iterator_default_buffer;
-            using boost::any_iterator_buffer;
-            using boost::any_iterator_heap_only_buffer;
-            using boost::any_iterator_stack_only_buffer;
-
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_default_buffer >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_heap_only_buffer >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<1> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<2> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<4> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<8> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<16> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<32> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<64> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<128> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<4096> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_buffer<16384> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_stack_only_buffer<128> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_stack_only_buffer<4096> >()();
-            test_type_erased_impl_fn< Container, Traversal, any_iterator_stack_only_buffer<16384> >()();
-        }
-
-        void test_type_erased_single_pass()
-        {
-            test_type_erased_exercise_buffer_types< std::list<int>, boost::single_pass_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::deque<int>, boost::single_pass_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::vector<int>, boost::single_pass_traversal_tag >();
-
-            test_type_erased_exercise_buffer_types< std::list<MockType>, boost::single_pass_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::single_pass_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::single_pass_traversal_tag >();
-        }
-
-        void test_type_erased_forward()
-        {
-            test_type_erased_exercise_buffer_types< std::list<int>, boost::forward_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::deque<int>, boost::forward_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::vector<int>, boost::forward_traversal_tag >();
-
-            test_type_erased_exercise_buffer_types< std::list<MockType>, boost::forward_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::forward_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::forward_traversal_tag >();
-        }
-
-        void test_type_erased_bidirectional()
-        {
-            test_type_erased_exercise_buffer_types< std::list<int>, boost::bidirectional_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::deque<int>, boost::bidirectional_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::vector<int>, boost::bidirectional_traversal_tag >();
-
-            test_type_erased_exercise_buffer_types< std::list<MockType>, boost::bidirectional_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::bidirectional_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::bidirectional_traversal_tag >();
-        }
-
-        void test_type_erased_random_access()
-        {
-            test_type_erased_exercise_buffer_types< std::deque<int>, boost::random_access_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::vector<int>, boost::random_access_traversal_tag >();
-
-            test_type_erased_exercise_buffer_types< std::deque<MockType>, boost::random_access_traversal_tag >();
-            test_type_erased_exercise_buffer_types< std::vector<MockType>, boost::random_access_traversal_tag >();
-        }
-
-        void test_type_erased_multiple_different_template_parameter_conversion()
-        {
-            typedef boost::any_range<
-                        int
-                      , boost::random_access_traversal_tag
-                      , int&
-                      , std::ptrdiff_t
-            > source_range_type;
-
-            typedef boost::any_range<
-                        int
-                      , boost::single_pass_traversal_tag
-                      , const int&
-                      , std::ptrdiff_t
-            > target_range_type;
-
-            source_range_type source;
-
-            // Converting via construction
-            target_range_type t1(source);
-
-            // Converting via assignment
-            target_range_type t2;
-            t2 = source;
-
-            // Converting via construction to a type with a reference type
-            // that is a value
-            typedef boost::any_range<
-                        int
-                      , boost::single_pass_traversal_tag
-                      , int
-                      , std::ptrdiff_t
-                    > target_range2_type;
-
-            target_range2_type t3(source);
-            target_range2_type t4;
-            t4 = source;
-        }
-
-        template<
-            class Traversal
-          , class ValueType
-          , class SourceValueType
-          , class SourceReference
-          , class TargetValueType
-          , class TargetReference
-        >
-        void test_type_erased_mix_values_impl()
-        {
-            typedef std::vector< ValueType > Container;
-
-            typedef typename boost::any_range_type_generator<
-                Container
-              , SourceValueType
-              , Traversal
-              , SourceReference
-            >::type source_type;
-
-            typedef typename boost::any_range_type_generator<
-                Container
-              , TargetValueType
-              , Traversal
-              , TargetReference
-            >::type target_type;
-
-            Container test_data;
-            for (int i = 0; i < 10; ++i)
-                test_data.push_back(i);
-
-            const source_type source_data(test_data);
-            target_type t1(source_data);
-            BOOST_CHECK_EQUAL_COLLECTIONS( source_data.begin(), source_data.end(),
-                                           t1.begin(), t1.end() );
-
-            target_type t2;
-            t2 = source_data;
-            BOOST_CHECK_EQUAL_COLLECTIONS( source_data.begin(), source_data.end(),
-                                           t2.begin(), t2.end() );
-        }
-
-        class MockInt
-        {
-        public:
-            MockInt() : m_value() {}
-            MockInt(int x) : m_value(x) {}
-            operator int() const { return m_value; }
-        private:
-            int m_value;
-        };
-
-
-        template<class Traversal>
-        void test_type_erased_mix_values_driver()
-        {
-            test_type_erased_mix_values_impl< Traversal, int, char, const int&, short, const int& >();
-            test_type_erased_mix_values_impl< Traversal, int, int*, const int&, char, const int& >();
-            test_type_erased_mix_values_impl< Traversal, MockInt, char, const MockInt&, short, const MockInt& >();
-
-            // In fact value type should have no effect in the eligibility
-            // for conversion, hence we should be able to convert it
-            // completely backwards!
-            test_type_erased_mix_values_impl< Traversal, int, short, const int&, char, const int& >();
-            test_type_erased_mix_values_impl< Traversal, int, char, const int&, int*, const int& >();
-        }
-
-        void test_type_erased_mix_values()
-        {
-            test_type_erased_mix_values_driver< boost::single_pass_traversal_tag >();
-            test_type_erased_mix_values_driver< boost::forward_traversal_tag >();
-            test_type_erased_mix_values_driver< boost::bidirectional_traversal_tag >();
-            test_type_erased_mix_values_driver< boost::random_access_traversal_tag >();
-        }
-
-        void test_type_erased_operator_brackets()
-        {
-            typedef boost::adaptors::type_erased<> type_erased_t;
-
-            std::vector<int> c;
-            for (int i = 0; i < 10; ++i)
-                c.push_back(i);
-
-            for (int i = 0; i < 10; ++i)
-            {
-                BOOST_CHECK_EQUAL( (c | type_erased_t())[i], i );
-            }
+            BOOST_CHECK_EQUAL( rng[i], i );
         }
     }
 }