diff --git a/test/Jamfile b/test/Jamfile
index de03dbee..dba8f9d5 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -63,7 +63,7 @@ test-suite "unit_test_framework_test"
           [ test-btl-lib run : test_case_template_test  : boost_test_exec_monitor ]
           [ test-btl-lib run : custom_exception_test    : boost_unit_test_framework ]
           [ test-btl-lib run : fixed_mapping_test       : boost_unit_test_framework ]
-          [ test-btl-lib run : ifstream_line_iterator_test : boost_unit_test_framework : $(test-dir)test_files/ifstream_line_iterator.tst1 $(test-dir)test_files/ifstream_line_iterator.tst2 ]
+          [ test-btl-lib run : ifstream_line_iterator_test : boost_unit_test_framework : $(test-dir)test_files$(SLASH)ifstream_line_iterator.tst1 $(test-dir)test_files$(SLASH)ifstream_line_iterator.tst2 ]
           [ test-btl-lib run : algorithms_test : boost_unit_test_framework ]
           [ test-btl-lib run : token_iterator_test : boost_unit_test_framework ]
           [ test-btl-lib run : boost_check_equal_str    : boost_test_exec_monitor ]
diff --git a/test/class_properties_test.cpp b/test/class_properties_test.cpp
index 6c42f064..b7b417fa 100644
--- a/test/class_properties_test.cpp
+++ b/test/class_properties_test.cpp
@@ -15,11 +15,12 @@
 // Boost.Test
 #include <boost/test/unit_test.hpp>
 #include <boost/test/utils/class_properties.hpp>
-using namespace boost::unit_test;
 
 // STL
 #include <vector>
 
+using namespace boost::unit_test;
+
 //____________________________________________________________________________//
 
 struct A {
@@ -196,6 +197,9 @@ init_unit_test_suite( int /*argc*/, char* /*argv*/[] ) {
 //  Revision History :
 //  
 //  $Log$
+//  Revision 1.7  2005/06/11 19:20:58  rogeeff
+//  *** empty log message ***
+//
 //  Revision 1.6  2005/05/11 05:07:56  rogeeff
 //  licence update
 //
diff --git a/test/errors_handling_test.cpp b/test/errors_handling_test.cpp
index e318a267..719c640d 100644
--- a/test/errors_handling_test.cpp
+++ b/test/errors_handling_test.cpp
@@ -23,13 +23,14 @@
 #include <boost/test/detail/unit_test_parameters.hpp>
 #include <boost/test/output/compiler_log_formatter.hpp>
 #include <boost/test/results_reporter.hpp>
-using namespace boost::unit_test;
-using namespace boost::test_tools;
 
 // STL
 #include <iostream>
 #include <stdexcept>
 
+using namespace boost::unit_test;
+using namespace boost::test_tools;
+
 #if defined(__GNUC__) || defined(__SUNPRO_CC)
 #define LIMITED_TEST
 #endif
@@ -197,6 +198,9 @@ test_main( int argc, char * argv[] )
 //  Revision History :
 //
 //  $Log$
+//  Revision 1.34  2005/06/11 19:20:58  rogeeff
+//  *** empty log message ***
+//
 //  Revision 1.33  2005/05/11 05:07:56  rogeeff
 //  licence update
 //
diff --git a/test/test_files/errors_handling_test.pattern b/test/test_files/errors_handling_test.pattern
index 148380e3..7c7cef52 100644
--- a/test/test_files/errors_handling_test.pattern
+++ b/test/test_files/errors_handling_test.pattern
@@ -3,7 +3,7 @@
 log level: log_successful_tests; error type: no error;
 
 Entering test case "error_on_demand"
-96: info: check 'no error' passed
+97: info: check 'no error' passed
 197: info: check 'Test case has less failures then expected' passed
 Leaving test case "error_on_demand"
 
@@ -19,7 +19,7 @@ Leaving test case "error_on_demand"
 log level: log_successful_tests; error type: user warning;
 
 Entering test case "error_on_demand"
-104: warning in "error_on_demand": warning
+105: warning in "error_on_demand": warning
 197: info: check 'Test case has less failures then expected' passed
 Leaving test case "error_on_demand"
 
@@ -27,7 +27,7 @@ Leaving test case "error_on_demand"
 log level: log_successful_tests; error type: user non-fatal error;
 
 Entering test case "error_on_demand"
-108: error in "error_on_demand": non-fatal error
+109: error in "error_on_demand": non-fatal error
 197: info: check 'Test case has less failures then expected' passed
 Leaving test case "error_on_demand"
 
@@ -36,7 +36,7 @@ log level: log_successful_tests; error type: cpp exception;
 
 Entering test case "error_on_demand"
 0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message
-118: last checkpoint: error_on_demand() throw runtime_error
+119: last checkpoint: error_on_demand() throw runtime_error
 197: info: check 'Test case has less failures then expected' passed
 Leaving test case "error_on_demand"
 
@@ -45,7 +45,7 @@ log level: log_successful_tests; error type:  system error;
 
 Entering test case "error_on_demand"
 0: fatal error in "error_on_demand": integer divide by zero
-123: last checkpoint: error_on_demand() divide by zero
+124: last checkpoint: error_on_demand() divide by zero
 197: info: check 'Test case has less failures then expected' passed
 Leaving test case "error_on_demand"
 
@@ -53,7 +53,7 @@ Leaving test case "error_on_demand"
 log level: log_successful_tests; error type: user fatal error;
 
 Entering test case "error_on_demand"
-112: fatal error in "error_on_demand": fatal error
+113: fatal error in "error_on_demand": fatal error
 197: info: check 'Test case has less failures then expected' passed
 Leaving test case "error_on_demand"
 
@@ -62,7 +62,7 @@ log level: log_successful_tests; error type: system fatal error;
 
 Entering test case "error_on_demand"
 0: fatal error in "error_on_demand": memory access violation
-128: last checkpoint: write to an invalid address
+129: last checkpoint: write to an invalid address
 Test is aborted
 197: info: check 'Test case has less failures then expected' passed
 Leaving test case "error_on_demand"
@@ -84,14 +84,14 @@ Leaving test case "error_on_demand"
 log level: log_test_suites; error type: user warning;
 
 Entering test case "error_on_demand"
-104: warning in "error_on_demand": warning
+105: warning in "error_on_demand": warning
 Leaving test case "error_on_demand"
 
 ===========================
 log level: log_test_suites; error type: user non-fatal error;
 
 Entering test case "error_on_demand"
-108: error in "error_on_demand": non-fatal error
+109: error in "error_on_demand": non-fatal error
 Leaving test case "error_on_demand"
 
 ===========================
@@ -99,7 +99,7 @@ log level: log_test_suites; error type: cpp exception;
 
 Entering test case "error_on_demand"
 0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message
-118: last checkpoint: error_on_demand() throw runtime_error
+119: last checkpoint: error_on_demand() throw runtime_error
 Leaving test case "error_on_demand"
 
 ===========================
@@ -107,14 +107,14 @@ log level: log_test_suites; error type:  system error;
 
 Entering test case "error_on_demand"
 0: fatal error in "error_on_demand": integer divide by zero
-123: last checkpoint: error_on_demand() divide by zero
+124: last checkpoint: error_on_demand() divide by zero
 Leaving test case "error_on_demand"
 
 ===========================
 log level: log_test_suites; error type: user fatal error;
 
 Entering test case "error_on_demand"
-112: fatal error in "error_on_demand": fatal error
+113: fatal error in "error_on_demand": fatal error
 Leaving test case "error_on_demand"
 
 ===========================
@@ -122,7 +122,7 @@ log level: log_test_suites; error type: system fatal error;
 
 Entering test case "error_on_demand"
 0: fatal error in "error_on_demand": memory access violation
-128: last checkpoint: write to an invalid address
+129: last checkpoint: write to an invalid address
 Test is aborted
 Leaving test case "error_on_demand"
 
@@ -138,35 +138,35 @@ message
 ===========================
 log level: log_messages; error type: user warning;
 
-104: warning in "error_on_demand": warning
+105: warning in "error_on_demand": warning
 
 ===========================
 log level: log_messages; error type: user non-fatal error;
 
-108: error in "error_on_demand": non-fatal error
+109: error in "error_on_demand": non-fatal error
 
 ===========================
 log level: log_messages; error type: cpp exception;
 
 0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message
-118: last checkpoint: error_on_demand() throw runtime_error
+119: last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 log level: log_messages; error type:  system error;
 
 0: fatal error in "error_on_demand": integer divide by zero
-123: last checkpoint: error_on_demand() divide by zero
+124: last checkpoint: error_on_demand() divide by zero
 
 ===========================
 log level: log_messages; error type: user fatal error;
 
-112: fatal error in "error_on_demand": fatal error
+113: fatal error in "error_on_demand": fatal error
 
 ===========================
 log level: log_messages; error type: system fatal error;
 
 0: fatal error in "error_on_demand": memory access violation
-128: last checkpoint: write to an invalid address
+129: last checkpoint: write to an invalid address
 Test is aborted
 
 ===========================
@@ -180,35 +180,35 @@ log level: log_warnings; error type: user message;
 ===========================
 log level: log_warnings; error type: user warning;
 
-104: warning in "error_on_demand": warning
+105: warning in "error_on_demand": warning
 
 ===========================
 log level: log_warnings; error type: user non-fatal error;
 
-108: error in "error_on_demand": non-fatal error
+109: error in "error_on_demand": non-fatal error
 
 ===========================
 log level: log_warnings; error type: cpp exception;
 
 0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message
-118: last checkpoint: error_on_demand() throw runtime_error
+119: last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 log level: log_warnings; error type:  system error;
 
 0: fatal error in "error_on_demand": integer divide by zero
-123: last checkpoint: error_on_demand() divide by zero
+124: last checkpoint: error_on_demand() divide by zero
 
 ===========================
 log level: log_warnings; error type: user fatal error;
 
-112: fatal error in "error_on_demand": fatal error
+113: fatal error in "error_on_demand": fatal error
 
 ===========================
 log level: log_warnings; error type: system fatal error;
 
 0: fatal error in "error_on_demand": memory access violation
-128: last checkpoint: write to an invalid address
+129: last checkpoint: write to an invalid address
 
 ===========================
 log level: log_all_errors; error type: no error;
@@ -225,30 +225,30 @@ log level: log_all_errors; error type: user warning;
 ===========================
 log level: log_all_errors; error type: user non-fatal error;
 
-108: error in "error_on_demand": non-fatal error
+109: error in "error_on_demand": non-fatal error
 
 ===========================
 log level: log_all_errors; error type: cpp exception;
 
 0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message
-118: last checkpoint: error_on_demand() throw runtime_error
+119: last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 log level: log_all_errors; error type:  system error;
 
 0: fatal error in "error_on_demand": integer divide by zero
-123: last checkpoint: error_on_demand() divide by zero
+124: last checkpoint: error_on_demand() divide by zero
 
 ===========================
 log level: log_all_errors; error type: user fatal error;
 
-112: fatal error in "error_on_demand": fatal error
+113: fatal error in "error_on_demand": fatal error
 
 ===========================
 log level: log_all_errors; error type: system fatal error;
 
 0: fatal error in "error_on_demand": memory access violation
-128: last checkpoint: write to an invalid address
+129: last checkpoint: write to an invalid address
 
 ===========================
 log level: log_cpp_exception_errors; error type: no error;
@@ -270,24 +270,24 @@ log level: log_cpp_exception_errors; error type: user non-fatal error;
 log level: log_cpp_exception_errors; error type: cpp exception;
 
 0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message
-118: last checkpoint: error_on_demand() throw runtime_error
+119: last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 log level: log_cpp_exception_errors; error type:  system error;
 
 0: fatal error in "error_on_demand": integer divide by zero
-123: last checkpoint: error_on_demand() divide by zero
+124: last checkpoint: error_on_demand() divide by zero
 
 ===========================
 log level: log_cpp_exception_errors; error type: user fatal error;
 
-112: fatal error in "error_on_demand": fatal error
+113: fatal error in "error_on_demand": fatal error
 
 ===========================
 log level: log_cpp_exception_errors; error type: system fatal error;
 
 0: fatal error in "error_on_demand": memory access violation
-128: last checkpoint: write to an invalid address
+129: last checkpoint: write to an invalid address
 
 ===========================
 log level: log_system_errors; error type: no error;
@@ -313,18 +313,18 @@ log level: log_system_errors; error type: cpp exception;
 log level: log_system_errors; error type:  system error;
 
 0: fatal error in "error_on_demand": integer divide by zero
-123: last checkpoint: error_on_demand() divide by zero
+124: last checkpoint: error_on_demand() divide by zero
 
 ===========================
 log level: log_system_errors; error type: user fatal error;
 
-112: fatal error in "error_on_demand": fatal error
+113: fatal error in "error_on_demand": fatal error
 
 ===========================
 log level: log_system_errors; error type: system fatal error;
 
 0: fatal error in "error_on_demand": memory access violation
-128: last checkpoint: write to an invalid address
+129: last checkpoint: write to an invalid address
 
 ===========================
 log level: log_fatal_errors; error type: no error;
@@ -353,13 +353,13 @@ log level: log_fatal_errors; error type:  system error;
 ===========================
 log level: log_fatal_errors; error type: user fatal error;
 
-112: fatal error in "error_on_demand": fatal error
+113: fatal error in "error_on_demand": fatal error
 
 ===========================
 log level: log_fatal_errors; error type: system fatal error;
 
 0: fatal error in "error_on_demand": memory access violation
-128: last checkpoint: write to an invalid address
+129: last checkpoint: write to an invalid address
 
 ===========================
 log level: log_nothing; error type: no error;
diff --git a/test/token_iterator_test.cpp b/test/token_iterator_test.cpp
index 0285d0f9..109e0a3c 100644
--- a/test/token_iterator_test.cpp
+++ b/test/token_iterator_test.cpp
@@ -15,9 +15,7 @@
 // Boost.Test
 #define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
-
 #include <boost/test/utils/iterator/token_iterator.hpp>
-namespace utf = boost::unit_test;
 
 // BOOST
 #include <boost/iterator/transform_iterator.hpp>
@@ -31,6 +29,8 @@ namespace utf = boost::unit_test;
 namespace std{ using ::toupper; using ::tolower; }
 #endif
 
+namespace utf = boost::unit_test;
+
 //____________________________________________________________________________//
 
 static utf::string_token_iterator  sti_end;
@@ -191,6 +191,9 @@ BOOST_AUTO_TEST_CASE( test_istream_token_iterator )
 // History :
 //
 // $Log$
+// Revision 1.12  2005/06/11 19:20:58  rogeeff
+// *** empty log message ***
+//
 // Revision 1.11  2005/06/05 18:10:59  grafik
 // named_param.hpp; Work around CW not handling operator, using declaration, by using a real operator,().
 // token_iterator_test.cpp; Work around CW-8 confused with array initialization.