diff --git a/test/optional_test_ref.cpp b/test/optional_test_ref.cpp
new file mode 100644
index 0000000..e687415
--- /dev/null
+++ b/test/optional_test_ref.cpp
@@ -0,0 +1,323 @@
+// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
+//
+// 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)
+//
+// See http://www.boost.org/lib/optional for documentation.
+//
+// You are welcome to contact the author at:
+//  fernando_cacciola@hotmail.com
+//
+#include<iostream>
+#include<stdexcept>
+#include<string>
+
+#define BOOST_ENABLE_ASSERT_HANDLER
+
+#include "boost/optional.hpp"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#include "boost/utility/none.hpp"
+
+#include "boost/test/minimal.hpp"
+
+#include "optional_test_common.cpp"
+
+template<class T>
+inline void check_ref_uninitialized_const ( optional<T&> const& opt )
+{
+#ifndef BOOST_OPTIONAL_NO_NULL_COMPARE
+  BOOST_CHECK( opt == 0 ) ;
+#endif  
+  BOOST_CHECK( !opt ) ;
+}
+template<class T>
+inline void check_ref_uninitialized ( optional<T&>& opt )
+{
+#ifndef BOOST_OPTIONAL_NO_NULL_COMPARE
+  BOOST_CHECK( opt == 0 ) ;
+#endif
+  BOOST_CHECK( !opt ) ;
+
+  check_ref_uninitialized_const(opt);
+}
+
+template<class T>
+inline void check_ref_initialized_const ( optional<T&> const& opt )
+{
+  BOOST_CHECK( opt ) ;
+
+#ifndef BOOST_OPTIONAL_NO_NULL_COMPARE
+  BOOST_CHECK( opt != 0 ) ;
+#endif
+
+  BOOST_CHECK ( !!opt ) ;
+}
+
+template<class T>
+inline void check_ref_initialized ( optional<T&>& opt )
+{
+  BOOST_CHECK( opt ) ;
+
+#ifndef BOOST_OPTIONAL_NO_NULL_COMPARE
+  BOOST_CHECK( opt != 0 ) ;
+#endif
+
+  BOOST_CHECK ( !!opt ) ;
+
+  check_ref_initialized_const(opt);
+}
+
+template<class T>
+inline void check_ref_value_const ( optional<T&> const& opt, T const& v, T const& z )
+{
+  BOOST_CHECK( *opt == v ) ;
+  BOOST_CHECK( *opt != z ) ;
+  BOOST_CHECK( opt.get() == v ) ;
+  BOOST_CHECK( opt.get() != z ) ;
+}
+
+template<class T>
+inline void check_ref_value ( optional<T&>& opt, T const& v, T const& z )
+{
+  BOOST_CHECK( *opt == v ) ;
+  BOOST_CHECK( *opt != z ) ;
+  BOOST_CHECK( opt.get() == v ) ;
+  BOOST_CHECK( opt.get() != z ) ;
+
+  check_ref_value_const(opt,v,z);
+}
+
+//
+// Basic test.
+// Check ordinary functionality:
+//   Initialization, assignment, comparison and value-accessing.
+//
+template<class T>
+void test_basics( T const* )
+{
+  TRACE( std::endl << BOOST_CURRENT_FUNCTION  );
+
+  T z(0);
+
+  T a(1);
+
+  T& aref = a ;
+
+  // Default construction.
+  // 'def' state is Uninitialized.
+  // T::T() is not called
+  optional<T&> def ;
+  check_ref_uninitialized(def);
+
+  // Direct initialization.
+  // 'oa' state is Initialized with 'a'
+  // T::T( T const& x ) is NOT used becasue the optional holds a reference.
+  set_pending_copy( ARG(T) ) ;
+  optional<T&> oa ( aref ) ;
+  check_is_pending_copy( ARG(T) );
+  check_ref_initialized(oa);
+  check_ref_value(oa,a,z);
+
+  // Copy initialization.
+  // T::T ( T const& x ) is NOT used becasue the optional holds a reference.
+  set_pending_copy( ARG(T) ) ;
+  optional<T&>  const oa2 ( oa ) ;
+  check_is_pending_copy( ARG(T) ) ;
+  check_ref_initialized_const(oa2);
+  check_ref_value_const(oa2,a,z);
+
+  T b(2);
+  optional<T&> ob ;
+
+  // Value-Assignment upon Uninitialized optional.
+  // T::T ( T const& x ) is NOT used becasue the optional holds a reference.
+  set_pending_copy( ARG(T) ) ;
+  ob = a ;
+  check_is_pending_copy( ARG(T) ) ;
+  check_ref_initialized(ob);
+  check_ref_value(ob,a,z);
+
+  // Value-Assignment upon Initialized optional.
+  // T::T ( T const& x ) is NOT used becasue the optional holds a reference.
+  set_pending_dtor( ARG(T) ) ;
+  set_pending_copy( ARG(T) ) ;
+  ob = b ;
+  check_is_pending_dtor( ARG(T) ) ;
+  check_is_pending_copy( ARG(T) ) ;
+  check_ref_initialized(ob);
+  check_ref_value(ob,b,z);
+
+  // Assignment initialization.
+  // T::T ( T const& x ) is NOT used becasue the optional holds a reference.
+  set_pending_copy( ARG(T) ) ;
+  optional<T&> const oa3 = b ;
+  check_is_pending_copy( ARG(T) ) ;
+  check_ref_initialized_const(oa3);
+  check_ref_value_const(oa3,b,z);
+
+
+  // Assignment
+  // T::~T() is used to destroy previous value in ob.
+  // T::T ( T const& x ) is NOT used becasue the optional holds a reference.
+  set_pending_dtor( ARG(T) ) ;
+  set_pending_copy( ARG(T) ) ;
+  oa = ob ;
+  check_is_pending_dtor( ARG(T) ) ;
+  check_is_pending_copy( ARG(T) ) ;
+  check_ref_initialized(oa);
+  check_ref_value(oa,b,z);
+
+  // Uninitializing Assignment upon Initialized Optional
+  // T::~T() is NOT used becasue the optional holds a reference.
+  set_pending_dtor( ARG(T) ) ;
+  set_pending_copy( ARG(T) ) ;
+  oa = def ;
+  check_is_pending_dtor( ARG(T) ) ;
+  check_is_pending_copy( ARG(T) ) ;
+  check_ref_uninitialized(oa);
+
+  // Uninitializing Assignment upon Uninitialized Optional
+  // (Dtor is not called this time)
+  set_pending_dtor( ARG(T) ) ;
+  set_pending_copy( ARG(T) ) ;
+  oa = def ;
+  check_is_pending_dtor( ARG(T) ) ;
+  check_is_pending_copy( ARG(T) ) ;
+  check_ref_uninitialized(oa);
+
+  // Deinitialization of Initialized Optional
+  // T::~T() is NOT used becasue the optional holds a reference.
+  set_pending_dtor( ARG(T) ) ;
+  ob.reset();
+  check_is_pending_dtor( ARG(T) ) ;
+  check_ref_uninitialized(ob);
+
+  // Deinitialization of Uninitialized Optional
+  // T::~T() is not called this time
+  set_pending_dtor( ARG(T) ) ;
+  ob.reset();
+  check_is_pending_dtor( ARG(T) ) ;
+  check_ref_uninitialized(ob);
+}
+
+//
+// This verifies relational operators.
+//
+template<class T>
+void test_relops( T const* )
+{
+  TRACE( std::endl << BOOST_CURRENT_FUNCTION   );
+  
+  reset_throw_on_copy( ARG(T) ) ;
+  
+  T v0(18);
+  T v1(19);
+  T v2(19);
+
+  optional<T&> def0 ;
+  optional<T&> def1 ;
+  optional<T&> opt0(v0);
+  optional<T&> opt1(v1);
+  optional<T&> opt2(v2);
+
+  // Check identity
+  BOOST_CHECK ( def0 == def0 ) ;
+  BOOST_CHECK ( opt0 == opt0 ) ;
+  BOOST_CHECK ( !(def0 != def0) ) ;
+  BOOST_CHECK ( !(opt0 != opt0) ) ;
+
+  // Check when both are uininitalized.
+  BOOST_CHECK (   def0 == def1  ) ; // both uninitialized compare equal
+  BOOST_CHECK ( !(def0 <  def1) ) ; // uninitialized is never less    than uninitialized 
+  BOOST_CHECK ( !(def0 >  def1) ) ; // uninitialized is never greater than uninitialized  
+  BOOST_CHECK ( !(def0 != def1) ) ;
+  BOOST_CHECK (   def0 <= def1  ) ; 
+  BOOST_CHECK (   def0 >= def1  ) ; 
+
+  // Check when only lhs is uninitialized.
+  BOOST_CHECK (   def0 != opt0  ) ; // uninitialized is never equal to initialized
+  BOOST_CHECK ( !(def0 == opt0) ) ;
+  BOOST_CHECK (   def0 <  opt0  ) ; // uninitialized is always less than initialized
+  BOOST_CHECK ( !(def0 >  opt0) ) ;
+  BOOST_CHECK (   def0 <= opt0  ) ;
+  BOOST_CHECK ( !(def0 >= opt0) ) ;
+
+  // Check when only rhs is uninitialized.
+  BOOST_CHECK (   opt0 != def0  ) ; // initialized is never equal to uninitialized
+  BOOST_CHECK ( !(opt0 == def0) ) ;
+  BOOST_CHECK ( !(opt0 <  def0) ) ; // initialized is never less than uninitialized
+  BOOST_CHECK (   opt0 >  def0  ) ;
+  BOOST_CHECK ( !(opt0 <= def0) ) ;
+  BOOST_CHECK (   opt0 >= opt0  ) ;
+  
+  // If both are initialized, values are compared
+  BOOST_CHECK ( opt0 != opt1 ) ;
+  BOOST_CHECK ( opt1 == opt2 ) ;
+  BOOST_CHECK ( opt0 <  opt1 ) ;
+  BOOST_CHECK ( opt1 >  opt0 ) ;
+  BOOST_CHECK ( opt1 <= opt2 ) ;
+  BOOST_CHECK ( opt1 >= opt0 ) ;
+}
+
+template<class T>
+void test_none( T const* )
+{
+  TRACE( std::endl << BOOST_CURRENT_FUNCTION   );
+
+  using boost::none ;
+  
+  T a(1234);
+
+  optional<T&> def0 ;
+  optional<T&> def1(none) ;
+  optional<T&> non_def(a) ;
+
+  BOOST_CHECK ( def0    == none ) ;
+  BOOST_CHECK ( non_def != none ) ;
+  BOOST_CHECK ( !def1           ) ;
+
+  non_def = none ;
+  BOOST_CHECK ( !non_def ) ;
+}
+
+void test_with_builtin_types()
+{
+  TRACE( std::endl << BOOST_CURRENT_FUNCTION   );
+
+  test_basics( ARG(double) );
+  test_relops( ARG(double) ) ;
+  test_none  ( ARG(double) ) ;
+}
+
+void test_with_class_type()
+{
+  TRACE( std::endl << BOOST_CURRENT_FUNCTION   );
+
+  test_basics( ARG(X) );
+  test_relops( ARG(X) ) ;
+  test_none  ( ARG(X) ) ;
+
+  BOOST_CHECK ( X::count == 0 ) ;
+}
+
+int test_main( int, char* [] )
+{
+  try
+  {
+    test_with_class_type();
+    test_with_builtin_types();
+  }
+  catch ( ... )
+  {
+    BOOST_ERROR("Unexpected Exception caught!");
+  }
+
+  return 0;
+}
+
+
diff --git a/test/optional_test_references_fail1c.cpp b/test/optional_test_ref_fail1.cpp
similarity index 100%
rename from test/optional_test_references_fail1c.cpp
rename to test/optional_test_ref_fail1.cpp
diff --git a/test/optional_test_ref_fail1a.cpp b/test/optional_test_ref_fail1a.cpp
new file mode 100644
index 0000000..8f89bae
--- /dev/null
+++ b/test/optional_test_ref_fail1a.cpp
@@ -0,0 +1,25 @@
+// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
+//
+// 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)
+//
+// See http://www.boost.org/lib/optional for documentation.
+//
+// You are welcome to contact the author at:
+//  fernando_cacciola@hotmail.com
+//
+#include "boost/optional.hpp"
+
+//
+// THIS TEST SHOULD FAIL TO COMPILE
+//
+void optional_reference__test_no_assignment1()
+{
+  boost::optional<int&> opt ;
+  int v = 2 ; 
+  int& r = v ;
+  opt = r ;
+}
+
+
diff --git a/test/optional_test_ref_fail1b.cpp b/test/optional_test_ref_fail1b.cpp
new file mode 100644
index 0000000..7bdce79
--- /dev/null
+++ b/test/optional_test_ref_fail1b.cpp
@@ -0,0 +1,25 @@
+// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
+//
+// 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)
+//
+// See http://www.boost.org/lib/optional for documentation.
+//
+// You are welcome to contact the author at:
+//  fernando_cacciola@hotmail.com
+//
+#include "boost/optional.hpp"
+
+//
+// THIS TEST SHOULD FAIL TO COMPILE
+//
+void optional_reference__test_assignment2()
+{
+  boost::optional<int&> opt ;
+  int v = 2 ; 
+  int& r = v ;
+  opt.reset ( r ) ;
+}
+
+
diff --git a/test/optional_test_ref_fail1c.cpp b/test/optional_test_ref_fail1c.cpp
new file mode 100644
index 0000000..1842741
--- /dev/null
+++ b/test/optional_test_ref_fail1c.cpp
@@ -0,0 +1,25 @@
+// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
+//
+// 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)
+//
+// See http://www.boost.org/lib/optional for documentation.
+//
+// You are welcome to contact the author at:
+//  fernando_cacciola@hotmail.com
+//
+#include "boost/optional.hpp"
+
+//
+// THIS TEST SHOULD FAIL TO COMPILE
+//
+void optional_reference__test_no_converting_assignment()
+{
+  boost::optional<int&> opt ;
+  short v = 1 ;
+  short& r = v ;
+  opt = r ;
+}
+
+
diff --git a/test/optional_test_references_fail2.cpp b/test/optional_test_ref_fail2.cpp
similarity index 100%
rename from test/optional_test_references_fail2.cpp
rename to test/optional_test_ref_fail2.cpp
diff --git a/test/optional_test_ref_fail3.cpp b/test/optional_test_ref_fail3.cpp
new file mode 100644
index 0000000..e630d07
--- /dev/null
+++ b/test/optional_test_ref_fail3.cpp
@@ -0,0 +1,23 @@
+// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
+//
+// 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)
+//
+// See http://www.boost.org/lib/optional for documentation.
+//
+// You are welcome to contact the author at:
+//  fernando_cacciola@hotmail.com
+//
+#include "boost/optional.hpp"
+
+//
+// THIS TEST SHOULD FAIL TO COMPILE
+//
+void optional_reference__test_no_converting_ctor()
+{
+  boost::optional<short&> opt1 ;
+  boost::optional<int&> opt2 = opt1 ;
+}
+
+
diff --git a/test/optional_test_ref_fail4.cpp b/test/optional_test_ref_fail4.cpp
new file mode 100644
index 0000000..0425243
--- /dev/null
+++ b/test/optional_test_ref_fail4.cpp
@@ -0,0 +1,24 @@
+// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
+//
+// 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)
+//
+// See http://www.boost.org/lib/optional for documentation.
+//
+// You are welcome to contact the author at:
+//  fernando_cacciola@hotmail.com
+//
+#include "boost/optional.hpp"
+
+//
+// THIS TEST SHOULD FAIL TO COMPILE
+//
+void optional_reference__test_no_converting_initialization()
+{
+  short v = 1 ;
+  short& r = v;
+  boost::optional<int&> opt(r) ;
+}
+
+
diff --git a/test/optional_test_ref_fail5.cpp b/test/optional_test_ref_fail5.cpp
new file mode 100644
index 0000000..0425243
--- /dev/null
+++ b/test/optional_test_ref_fail5.cpp
@@ -0,0 +1,24 @@
+// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
+//
+// 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)
+//
+// See http://www.boost.org/lib/optional for documentation.
+//
+// You are welcome to contact the author at:
+//  fernando_cacciola@hotmail.com
+//
+#include "boost/optional.hpp"
+
+//
+// THIS TEST SHOULD FAIL TO COMPILE
+//
+void optional_reference__test_no_converting_initialization()
+{
+  short v = 1 ;
+  short& r = v;
+  boost::optional<int&> opt(r) ;
+}
+
+