diff --git a/test/Jamfile b/test/Jamfile
index 47dad13..d15e46e 100755
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -19,8 +19,10 @@ test-suite "parameter"
      [ run singular.cpp ]
      [ run mpl.cpp ]
      [ run preprocessor.cpp ]
+     [ run preprocessor_deduced.cpp ]
      [ run efficiency.cpp : : : : : release ]
      [ run maybe.cpp ]
+     [ run deduced.cpp ]
      [ compile ntp.cpp ]
      [ compile unwrap_cv_reference.cpp ]
      [ compile-fail duplicates.cpp ]
@@ -31,13 +33,13 @@ test-suite "parameter"
 
 import python ;
 
-extension python_parameter 
-  : python.cpp
+extension python_test_ext
+  : python_test.cpp
     <template>@boost/libs/python/build/extension
   ;
 
 boost-python-runtest python-parameter-test
-  : python.py
-    <pyd>python_parameter
+  : python_test.py
+    <pyd>python_test_ext
   ;
 
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index f5ebfd9..b8c1f27 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -4,6 +4,8 @@
 
 # Boost Parameter Library test Jamfile
 
+import python ;
+
 project boost/parameter
   : default-build <warnings>off
   ;
@@ -18,12 +20,16 @@ test-suite "parameter"
      [ run singular.cpp ]
      [ run mpl.cpp ]
      [ run preprocessor.cpp ]
+     [ run preprocessor_deduced.cpp ]
      [ run efficiency.cpp : : : : : <variant>release ]
      [ run maybe.cpp ]
+     [ run deduced.cpp ]
      [ compile ntp.cpp ]
      [ compile unwrap_cv_reference.cpp ]
      [ compile-fail duplicates.cpp ]
      [ compile-fail unnamed_fail.cpp ]
      [ compile compose.cpp ]
+     [ compile normalized_argument_types.cpp ]
+     [ bpl-test python_test ]
   ;
 
diff --git a/test/deduced.cpp b/test/deduced.cpp
new file mode 100755
index 0000000..2d744a2
--- /dev/null
+++ b/test/deduced.cpp
@@ -0,0 +1,180 @@
+// Copyright Daniel Wallin 2006. Use, modification and distribution is
+// subject to the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/parameter/parameters.hpp>
+#include <boost/parameter/name.hpp>
+#include <boost/parameter/binding.hpp>
+#include <boost/mpl/for_each.hpp>
+#include "basics.hpp"
+
+namespace parameter = boost::parameter;
+namespace mpl = boost::mpl;
+
+struct not_present_tag {};
+not_present_tag not_present;
+
+BOOST_PARAMETER_NAME(x)
+BOOST_PARAMETER_NAME(y)
+BOOST_PARAMETER_NAME(z)
+
+template <class E, class ArgPack>
+struct assert_expected
+{
+    assert_expected(E const& e, ArgPack const& args)
+      : expected(e)
+      , args(args)
+    {}
+
+    template <class T>
+    bool check_not_present(T const&) const
+    {
+        BOOST_MPL_ASSERT((boost::is_same<T,not_present_tag>));
+        return true;
+    }
+
+    template <class K>
+    bool check(K const& k, not_present_tag const&, long) const
+    {
+        return check_not_present(args[k | not_present]);
+    }
+
+    template <class K, class Expected>
+    bool check(K const& k, Expected const& expected, int) const
+    {
+        return test::equal(args[k], expected);
+    }
+
+    template <class K>
+    void operator()(K) const
+    {
+        parameter::keyword<K> const& k = parameter::keyword<K>::get();
+        assert(check(k, expected[k], 0L));
+    }
+
+    E const& expected;
+    ArgPack const& args;
+};
+
+template <class E, class ArgPack>
+void check0(E const& e, ArgPack const& args)
+{
+    mpl::for_each<E>(assert_expected<E,ArgPack>(e, args));
+}
+
+template <class P, class E, class A0>
+void check(E const& e, A0 const& a0)
+{
+    check0(e, P()(a0));
+}
+
+template <class P, class E, class A0, class A1>
+void check(E const& e, A0 const& a0, A1 const& a1)
+{
+    check0(e, P()(a0,a1));
+}
+
+template <class P, class E, class A0, class A1, class A2>
+void check(E const& e, A0 const& a0, A1 const& a1, A2 const& a2)
+{
+    check0(e, P()(a0,a1,a2));
+}
+
+int main()
+{
+    using namespace parameter;
+
+    check<
+        parameters<
+            tag::x
+          , tag::y
+        >
+    >(
+        (_x = 0, _y = 1)
+      , 0
+      , 1
+    );
+
+    check<
+        parameters<
+            tag::x
+          , required<deduced<tag::y>, boost::is_convertible<mpl::_, int> >
+          , optional<deduced<tag::z>, boost::is_convertible<mpl::_, char const*> >
+        >
+    >(
+        (_x = 0, _y = not_present, _z = "foo")
+      , _x = 0
+      , "foo"
+    );
+
+    check<
+        parameters<
+            tag::x
+          , required<deduced<tag::y>, boost::is_convertible<mpl::_, int> >
+          , optional<deduced<tag::z>, boost::is_convertible<mpl::_, char const*> >
+        >
+    >(
+        (_x = 0, _y = 1, _z = "foo")
+      , 0
+      , "foo"
+      , 1
+    );
+
+    check<
+        parameters<
+            tag::x
+          , required<deduced<tag::y>, boost::is_convertible<mpl::_, int> >
+          , optional<deduced<tag::z>, boost::is_convertible<mpl::_, char const*> >
+        >
+    >(
+        (_x = 0, _y = 1, _z = "foo")
+      , 0
+      , 1
+      , "foo"
+    );
+
+    check<
+        parameters<
+            tag::x
+          , required<deduced<tag::y>, boost::is_convertible<mpl::_, int> >
+          , optional<deduced<tag::z>, boost::is_convertible<mpl::_, char const*> >
+        >
+    >(
+        (_x = 0, _y = 1, _z = "foo")
+      , 0
+      , _y = 1
+      , "foo"
+    );
+
+    check<
+        parameters<
+            tag::x
+          , required<deduced<tag::y>, boost::is_convertible<mpl::_, int> >
+          , optional<deduced<tag::z>, boost::is_convertible<mpl::_, char const*> >
+        >
+    >(
+        (_x = 0, _y = 1, _z = "foo")
+      , _z = "foo"
+      , _x = 0
+      , 1
+    );
+
+    // Fails becasue of parameters.hpp:428
+/*
+    check<
+        parameters<
+            tag::x
+          , required<deduced<tag::y>, boost::is_convertible<mpl::_, int> >
+          , optional<deduced<tag::z>, boost::is_convertible<mpl::_, char const*> >
+        >
+    >(
+        (_x = 0, _y = 1, _z = "foo")
+      , _x = 0
+      , (long*)0
+      , 1
+    );
+*/
+
+    return 0;
+};
+
diff --git a/test/ntp.cpp b/test/ntp.cpp
index fcf4ca1..8d18f21 100755
--- a/test/ntp.cpp
+++ b/test/ntp.cpp
@@ -43,8 +43,9 @@ struct with_ntp
 {
     typedef typename parameter::parameters<
         a0_is<>, a1_is<>, a2_is<>
-      , parameter::unnamed<
-            a3_is<>, boost::is_base_and_derived<X, mpl::_>
+      , parameter::optional<
+            parameter::deduced<a3_is<> >
+          , boost::is_base_and_derived<X, mpl::_>
         >
     >::bind<A0,A1,A2,A3
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
@@ -100,10 +101,10 @@ BOOST_MPL_ASSERT((boost::is_same<
 >));
 
 BOOST_MPL_ASSERT((boost::is_same<
-    with_ntp<Y>::type, void(*)(void*,void*,void*, Y)
+    with_ntp<a0_is<int>, Y>::type, void(*)(int,void*,void*, Y)
 >));
 
 BOOST_MPL_ASSERT((boost::is_same<
-    with_ntp<int&, Y, a2_is<char> >::type, void(*)(int&,void*,char, Y)
+    with_ntp<int&, a2_is<char>, Y>::type, void(*)(int&,void*,char, Y)
 >));
 
diff --git a/test/preprocessor.cpp b/test/preprocessor.cpp
index 1495a8b..4edbe62 100755
--- a/test/preprocessor.cpp
+++ b/test/preprocessor.cpp
@@ -297,6 +297,12 @@ sfinae1(A0 const& a0)
 }
 #endif
 
+template <class T>
+T const& as_lvalue(T const& x)
+{
+    return x;
+}
+
 }
 
 int main()
@@ -304,7 +310,7 @@ int main()
     using namespace test;
 
     f(
-        tester = values(S("foo"), 1.f, 2)
+        values(S("foo"), 1.f, 2)
       , S("foo")
     );
 
@@ -314,41 +320,56 @@ int main()
     );
 
     int index_lvalue = 2;
-    
+
     f(
         tester = values(S("foo"), 1.f, 2)
       , name = S("foo")
+      , value = 1.f
+      , test::index = index_lvalue
+    );
+
+    f(
+        values(S("foo"), 1.f, 2)
+      , S("foo")
       , 1.f
       , index_lvalue
     );
 
     g(
-        tester = values(S("foo"), 1.f, 2)
-      , name = S("foo")
+        values(S("foo"), 1.f, 2)
+      , S("foo")
       , 1.f
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+      , as_lvalue(2)
+#else
       , 2
+#endif
     );
 
     h(
-        tester = values(S("foo"), 1.f, 2)
-      , name = S("foo")
+        values(S("foo"), 1.f, 2)
+      , S("foo")
       , 1.f
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+      , as_lvalue(2)
+#else
       , 2
+#endif
     );
 
     h2(
         tester = values(S("foo"), 1.f, 2)
       , name = S("foo")
-      , 1.f
+      , value = 1.f
     );
-    
+
     class_ x(
-        tester = values(S("foo"), 1.f, 2)
+        values(S("foo"), 1.f, 2)
       , S("foo"), test::index = 2
     );
 
     x.f(
-        tester = values(S("foo"), 1.f, 2)
+        values(S("foo"), 1.f, 2)
       , S("foo")
     );
 
@@ -358,7 +379,7 @@ int main()
     );
 
     x.f2(
-        tester = values(S("foo"), 1.f, 2)
+        values(S("foo"), 1.f, 2)
       , S("foo")
     );
 
@@ -370,7 +391,7 @@ int main()
     class_ const& x_const = x;
 
     x_const.f(
-        tester = values(S("foo"), 1.f, 2)
+        values(S("foo"), 1.f, 2)
       , S("foo")
     );
 
@@ -380,7 +401,7 @@ int main()
     );
 
     x_const.f2(
-        tester = values(S("foo"), 1.f, 2)
+        values(S("foo"), 1.f, 2)
       , S("foo")
     );
 
@@ -395,7 +416,7 @@ int main()
     );
 
     class_::f_static(
-        tester = values(S("foo"), 1.f, 2)
+        values(S("foo"), 1.f, 2)
       , S("foo")
     );
 
diff --git a/test/preprocessor_deduced.cpp b/test/preprocessor_deduced.cpp
new file mode 100755
index 0000000..04ca1fb
--- /dev/null
+++ b/test/preprocessor_deduced.cpp
@@ -0,0 +1,110 @@
+// Copyright Daniel Wallin 2006. Use, modification and distribution is
+// subject to the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/parameter/preprocessor.hpp>
+#include <boost/parameter/name.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/tuple/tuple.hpp>
+#include <string>
+#include "basics.hpp"
+
+namespace test {
+
+namespace mpl = boost::mpl;
+
+using mpl::_;
+using boost::is_convertible;
+
+BOOST_PARAMETER_NAME(expected)
+BOOST_PARAMETER_NAME(x)
+BOOST_PARAMETER_NAME(y)
+BOOST_PARAMETER_NAME(z)
+
+BOOST_PARAMETER_FUNCTION((int), f, tag,
+    (required
+       (expected, *)
+    )
+    (deduced
+       (required
+          (x, *(is_convertible<_, int>))
+          (y, *(is_convertible<_, std::string>))
+       )
+    )
+)
+{
+    assert(equal(x, boost::tuples::get<0>(expected)));
+    assert(equal(y, boost::tuples::get<1>(expected)));
+    return 1;
+}
+
+struct X 
+{
+    X(int x = -1)
+      : x(x)
+    {}
+    
+    bool operator==(X const& other) const
+    {
+        return x == other.x;
+    }
+    
+    int x;
+};
+
+BOOST_PARAMETER_FUNCTION((int), g, tag,
+    (required
+      (expected, *)
+    )
+    (deduced
+       (required
+          (x, *(is_convertible<_, int>))
+          (y, *(is_convertible<_, std::string>))
+       )
+       (optional
+          (z, *(is_convertible<_, X>), X())
+       )
+    )
+)
+{
+    assert(equal(x, boost::tuples::get<0>(expected)));
+    assert(equal(y, boost::tuples::get<1>(expected)));
+    assert(equal(z, boost::tuples::get<2>(expected)));
+    return 1;
+}
+
+} // namespace test
+
+using boost::make_tuple;
+
+// make_tuple doesn't work with char arrays.
+char const* str(char const* s)
+{
+    return s;
+}
+
+int main()
+{
+    using namespace test;
+
+    f(make_tuple(0, str("foo")), _x = 0, _y = "foo");
+    f(make_tuple(0, str("foo")), _x = 0, _y = "foo");
+    f(make_tuple(0, str("foo")), 0, "foo");
+    f(make_tuple(0, str("foo")), "foo", 0);
+    f(make_tuple(0, str("foo")), _y = "foo", 0);
+    f(make_tuple(0, str("foo")), _x = 0, "foo");
+    f(make_tuple(0, str("foo")), 0, _y = "foo");
+
+    g(make_tuple(0, str("foo"), X()), _x = 0, _y = "foo");
+    g(make_tuple(0, str("foo"), X()), 0, "foo");
+    g(make_tuple(0, str("foo"), X()), "foo", 0);
+    g(make_tuple(0, str("foo"), X()), _y = "foo", 0);   
+    g(make_tuple(0, str("foo"), X()), _x = 0, "foo");
+    g(make_tuple(0, str("foo"), X()), 0, _y = "foo");
+
+    g(make_tuple(0, str("foo"), X(1)), 0, _y = "foo", X(1));
+    g(make_tuple(0, str("foo"), X(1)), X(1), 0, _y = "foo");
+
+    return 0;
+}
+
diff --git a/test/python.cpp b/test/python_test.cpp
similarity index 98%
rename from test/python.cpp
rename to test/python_test.cpp
index 584469d..a9612ae 100755
--- a/test/python.cpp
+++ b/test/python_test.cpp
@@ -105,7 +105,7 @@ struct h_fwd
     }
 };
 
-BOOST_PYTHON_MODULE(python_parameter)
+BOOST_PYTHON_MODULE(python_test_ext)
 {
     namespace mpl = boost::mpl;
     using namespace test;
diff --git a/test/python.py b/test/python_test.py
similarity index 86%
rename from test/python.py
rename to test/python_test.py
index cf4d8de..ce3b81c 100644
--- a/test/python.py
+++ b/test/python_test.py
@@ -3,7 +3,7 @@
 # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 '''
->>> from python_parameter import X
+>>> from python_test_ext import X
 >>> x = X(y = 'baz')
 >>> x.value
 'foobaz'
@@ -33,8 +33,8 @@ def run(args = None):
     if args is not None:
         import sys
         sys.argv = args
-    import doctest, python 
-    return doctest.testmod(python)
+    import doctest, python_test 
+    return doctest.testmod(python_test)
 
 if __name__ == '__main__':
     import sys