diff --git a/test/testwave/testfiles/test.cfg b/test/testwave/testfiles/test.cfg
index d56708d..a2eaff3 100644
--- a/test/testwave/testfiles/test.cfg
+++ b/test/testwave/testfiles/test.cfg
@@ -2,211 +2,211 @@
 #    Boost.Wave: A Standard compliant C++ preprocessor library
 #    http://www.boost.org/
 #
-#    Copyright (c) 2001-2005 Hartmut Kaiser. Distributed under the Boost
+#    Copyright (c) 2t_1-2005 Hartmut Kaiser. Distributed under 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)
 #
 
 #
-# 001: Macro expansion
+# t_1: Macro expansion
 #
-001_001.cpp
-001_002.cpp
-001_003.cpp
-001_004.cpp
-001_005.cpp
-001_006.cpp
-001_007.cpp
-001_008.cpp
-001_009.cpp
-001_010.cpp
-001_011.cpp
-001_012.cpp
-001_013.cpp
-# 001_014 currently disabled because of a known problem in the Wave library
-#001_014.cpp
-001_015.cpp
-001_016.cpp
-001_017.cpp
-001_018.cpp
-001_019.cpp
-001_020.cpp
-001_021.cpp
-001_022.cpp
-001_023.cpp
-001_024.cpp
-001_025.cpp
-001_026.cpp
-001_027.cpp
-001_028.cpp
-001_029.cpp
-001_030.cpp
-001_031.cpp
-001_032.cpp
-001_033.cpp
-001_034.cpp
-001_035.cpp
-001_036.cpp
-001_037.cpp
+t_1_001.cpp
+t_1_002.cpp
+t_1_003.cpp
+t_1_004.cpp
+t_1_005.cpp
+t_1_006.cpp
+t_1_007.cpp
+t_1_008.cpp
+t_1_009.cpp
+t_1_010.cpp
+t_1_011.cpp
+t_1_012.cpp
+t_1_013.cpp
+# t_1_014 currently disabled because of a known problem in the Wave library
+#t_1_014.cpp
+t_1_015.cpp
+t_1_016.cpp
+t_1_017.cpp
+t_1_018.cpp
+t_1_019.cpp
+t_1_020.cpp
+t_1_021.cpp
+t_1_022.cpp
+t_1_023.cpp
+t_1_024.cpp
+t_1_025.cpp
+t_1_026.cpp
+t_1_027.cpp
+t_1_028.cpp
+t_1_029.cpp
+t_1_030.cpp
+t_1_031.cpp
+t_1_032.cpp
+t_1_033.cpp
+t_1_034.cpp
+t_1_035.cpp
+t_1_036.cpp
+t_1_037.cpp
 
 #
-# 002: Preprocessing directives
+# t_2: Preprocessing directives
 #
-002_001.cpp
-002_002.cpp
-002_003.cpp
-002_004.cpp
-002_005.cpp
-002_006.cpp
-002_007.cpp
-002_008.cpp
-002_009.cpp
-002_010.cpp
-002_011.cpp
-002_012.cpp
-002_013.cpp
-002_014.cpp
-002_015.cpp
-002_016.cpp
+t_2_001.cpp
+t_2_002.cpp
+t_2_003.cpp
+t_2_004.cpp
+t_2_005.cpp
+t_2_006.cpp
+t_2_007.cpp
+t_2_008.cpp
+t_2_009.cpp
+t_2_010.cpp
+t_2_011.cpp
+t_2_012.cpp
+t_2_013.cpp
+t_2_014.cpp
+t_2_015.cpp
+t_2_016.cpp
 
 #
-# 003: Predefined macros
+# t_3: Predefined macros
 #
-003_001.cpp
-003_002.cpp
-003_003.cpp
-003_004.cpp
+t_3_001.cpp
+t_3_002.cpp
+t_3_003.cpp
+t_3_004.cpp
 
 #
 # Preprocessing expressions
 #
-004_001.cpp
-004_002.cpp
-004_003.cpp
+t_4_001.cpp
+t_4_002.cpp
+t_4_003.cpp
 
 #
 # unit tests from the mcpp preprocessor validation suite
 # (general functionality)
 #
-005_001.cpp
-005_002.cpp
-005_003.cpp
-# 005_004 is currently disabled because of a known problem in the Wave library
-#005_004.cpp
-005_005.cpp
-005_006.cpp
-005_007.cpp
-005_008.cpp
-005_009.cpp
-005_010.cpp
-005_011.cpp
-005_012.cpp
-005_013.cpp
-005_014.cpp
-005_015.cpp
-005_016.cpp
-005_017.cpp
-005_018.cpp
-005_019.cpp
-005_020.cpp
-005_021.cpp
-005_022.cpp
-005_023.cpp
-005_024.cpp
-# 005_025 is currently disabled because of a known problem in the Wave library
-#005_025.cpp
-005_026.cpp
-005_027.cpp
-005_028.cpp
-005_029.cpp
-# 005_030 contains two disabled tests
-005_030.cpp
-005_031.cpp
-005_032.cpp
-005_033.cpp
-005_034.cpp
-005_035.cpp
+t_5_001.cpp
+t_5_002.cpp
+t_5_003.cpp
+# t_5_004 is currently disabled because of a known problem in the Wave library
+#t_5_004.cpp
+t_5_005.cpp
+t_5_006.cpp
+t_5_007.cpp
+t_5_008.cpp
+t_5_009.cpp
+t_5_010.cpp
+t_5_011.cpp
+t_5_012.cpp
+t_5_013.cpp
+t_5_014.cpp
+t_5_015.cpp
+t_5_016.cpp
+t_5_017.cpp
+t_5_018.cpp
+t_5_019.cpp
+t_5_020.cpp
+t_5_021.cpp
+t_5_022.cpp
+t_5_023.cpp
+t_5_024.cpp
+# t_5_025 is currently disabled because of a known problem in the Wave library
+#t_5_025.cpp
+t_5_026.cpp
+t_5_027.cpp
+t_5_028.cpp
+t_5_029.cpp
+# t_5_030 contains two disabled tests
+t_5_030.cpp
+t_5_031.cpp
+t_5_032.cpp
+t_5_033.cpp
+t_5_034.cpp
+t_5_035.cpp
 
 #
 # unit tests from the mcpp preprocessor validation suite
 # (error reporting)
 #
-006_001.cpp
-006_002.cpp
-006_003.cpp
-006_004.cpp
-006_005.cpp
-006_006.cpp
-006_007.cpp
-006_008.cpp
-006_009.cpp
-006_010.cpp
-006_011.cpp
-006_012.cpp
-006_013.cpp
-006_014.cpp
-006_015.cpp
-006_016.cpp
-006_017.cpp
-006_018.cpp
-006_019.cpp
-006_020.cpp
-006_021.cpp
-006_022.cpp
-006_023.cpp
-006_024.cpp
-006_025.cpp
-006_026.cpp
-006_027.cpp
-006_028.cpp
-006_029.cpp
-006_030.cpp
-006_031.cpp
-006_032.cpp
-006_033.cpp
-006_034.cpp
-006_035.cpp
-006_036.cpp
-006_037.cpp
-006_038.cpp
-006_039.cpp
-006_040.cpp
-006_041.cpp
-006_042.cpp
-006_043.cpp
-006_044.cpp
-006_045.cpp
-006_046.cpp
-006_047.cpp
-006_048.cpp
-006_049.cpp
-006_050.cpp
-006_051.cpp
-006_052.cpp
-006_053.cpp
-006_054.cpp
-006_055.cpp
-006_056.cpp
-006_057.cpp
-006_058.cpp
-006_059.cpp
-006_060.cpp
-006_061.cpp
-006_062.cpp
+t_6_001.cpp
+t_6_002.cpp
+t_6_003.cpp
+t_6_004.cpp
+t_6_005.cpp
+t_6_006.cpp
+t_6_007.cpp
+t_6_008.cpp
+t_6_009.cpp
+t_6_010.cpp
+t_6_011.cpp
+t_6_012.cpp
+t_6_013.cpp
+t_6_014.cpp
+t_6_015.cpp
+t_6_016.cpp
+t_6_017.cpp
+t_6_018.cpp
+t_6_019.cpp
+t_6_020.cpp
+t_6_021.cpp
+t_6_022.cpp
+t_6_023.cpp
+t_6_024.cpp
+t_6_025.cpp
+t_6_026.cpp
+t_6_027.cpp
+t_6_028.cpp
+t_6_029.cpp
+t_6_030.cpp
+t_6_031.cpp
+t_6_032.cpp
+t_6_033.cpp
+t_6_034.cpp
+t_6_035.cpp
+t_6_036.cpp
+t_6_037.cpp
+t_6_038.cpp
+t_6_039.cpp
+t_6_040.cpp
+t_6_041.cpp
+t_6_042.cpp
+t_6_043.cpp
+t_6_044.cpp
+t_6_045.cpp
+t_6_046.cpp
+t_6_047.cpp
+t_6_048.cpp
+t_6_049.cpp
+t_6_050.cpp
+t_6_051.cpp
+t_6_052.cpp
+t_6_053.cpp
+t_6_054.cpp
+t_6_055.cpp
+t_6_056.cpp
+t_6_057.cpp
+t_6_058.cpp
+t_6_059.cpp
+t_6_060.cpp
+t_6_061.cpp
+t_6_062.cpp
 
 #
-# 999: General preprocessing problems
+# t_9: General preprocessing problems
 #
-999_001.cpp
-999_002.cpp
-999_003.cpp
-999_004.cpp
-999_005.cpp
-999_006.cpp
-999_007.cpp
-999_008.cpp
-999_009.cpp
-999_010.cpp
-999_011.cpp
-999_012.cpp
-999_013.cpp
+t_9_001.cpp
+t_9_002.cpp
+t_9_003.cpp
+t_9_004.cpp
+t_9_005.cpp
+t_9_006.cpp
+t_9_007.cpp
+t_9_008.cpp
+t_9_009.cpp
+t_9_010.cpp
+t_9_011.cpp
+t_9_012.cpp
+t_9_013.cpp