diff --git a/test/add_classifiers_seq.cpp b/test/add_classifiers_seq.cpp
index fe2942e..4249d28 100644
--- a/test/add_classifiers_seq.cpp
+++ b/test/add_classifiers_seq.cpp
@@ -14,8 +14,7 @@
 #include <boost/detail/lightweight_test.hpp>
 
 int main(void) {
-    /** @todo re-add register and document that vacpp doesn't support it */
-    int BOOST_LOCAL_FUNCTION( (auto int x) (/*register*/ int y) ) {
+    int BOOST_LOCAL_FUNCTION( (auto int x) (register int y) ) {
         return x + y;
     } BOOST_LOCAL_FUNCTION_NAME(add)
 
diff --git a/test/all_decl_seq.cpp b/test/all_decl_seq.cpp
index 7bf444d..9c0d284 100644
--- a/test/all_decl_seq.cpp
+++ b/test/all_decl_seq.cpp
@@ -124,10 +124,11 @@ struct s {
                     (const bind p) (bind this_) ) {
             } BOOST_LOCAL_FUNCTION_NAME(pt)
             pt();*/
+/** is this the problem?
             void BOOST_LOCAL_FUNCTION( (const bind a) (const bind& b)
                     (const bind p) (bind c) (bind this_) (bind& d) (bind q) ) {
             } BOOST_LOCAL_FUNCTION_NAME(lpt)
-            lpt();
+            lpt();*/
         }
 
         { // All params, const binds, and plain binds.
diff --git a/test/return_derivative.cpp b/test/return_derivative.cpp
index 14729dc..5bd05dc 100644
--- a/test/return_derivative.cpp
+++ b/test/return_derivative.cpp
@@ -17,8 +17,6 @@
 #include <boost/detail/lightweight_test.hpp>
 
 BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function, 1)
-/** @todo is this really needed? does it fix the problem with gcc-mingw-4.5.2[_0x] or not? */
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function1, 2) // Also `functionN`.
 
 boost::function<int (int)> derivative(boost::function<int (int)>& f, int dx) {
     int BOOST_LOCAL_FUNCTION(bind& f, const bind dx, int x) {
diff --git a/test/return_derivative_seq.cpp b/test/return_derivative_seq.cpp
index 9a33c00..b32ba37 100644
--- a/test/return_derivative_seq.cpp
+++ b/test/return_derivative_seq.cpp
@@ -12,7 +12,6 @@
 #include <boost/detail/lightweight_test.hpp>
 
 BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function, 1)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function1, 2) // Also `functionN`.
 
 boost::function<int (int)> derivative(boost::function<int (int)>& f, int dx) {
     int BOOST_LOCAL_FUNCTION( (bind& f) (const bind dx) (int x) ) {
diff --git a/test/same_line.cpp b/test/same_line.cpp
index 3a955f6..18b0cc7 100644
--- a/test/same_line.cpp
+++ b/test/same_line.cpp
@@ -41,19 +41,13 @@
 template<typename T>
 void f(T& delta) {
     LOCAL_INC_DEC_TPL(delta) // Multiple local functions on same line.
-    /** @todo back to BOOST_TEST(dec(inc(123)) == 123)) and doc that on vacpp compiler composition doesn't work */
-    BOOST_TEST(inc(123) == 123 + delta);
-    BOOST_TEST(dec(123) == 123 - delta);
+    BOOST_TEST(dec(inc(123)) == 123);
 }
 
 int main(void) {
     int delta = 10;
-
     LOCAL_INC_DEC(delta) // Multiple local functions on same line.
-    /** @todo back to BOOST_TEST(dec(inc(123)) == 123)) and doc that on vacpp compiler composition doesn't work */
-    BOOST_TEST(inc(123) == 123 + delta);
-    BOOST_TEST(dec(123) == 123 - delta);
-
+    BOOST_TEST(dec(inc(123)) == 123);
     f(delta);
     return boost::report_errors();
 }
diff --git a/test/same_line_seq.cpp b/test/same_line_seq.cpp
index e5fd80a..2113f47 100644
--- a/test/same_line_seq.cpp
+++ b/test/same_line_seq.cpp
@@ -35,19 +35,13 @@
 template<typename T>
 void f(T& delta) {
     LOCAL_INC_DEC_TPL(delta) // Multiple local functions on same line.
-    /** @todo back to BOOST_TEST(dec(inc(123)) == 123)) and doc that on vacpp compiler composition doesn't work */
-    BOOST_TEST(inc(123) == 123 + delta);
-    BOOST_TEST(dec(123) == 123 - delta);
+    BOOST_TEST(dec(inc(123)) == 123);
 }
 
 int main(void) {
     int delta = 10;
-
     LOCAL_INC_DEC(delta) // Declare local functions on same line using `_ID`.
-    /** @todo back to BOOST_TEST(dec(inc(123)) == 123)) and doc that on vacpp compiler composition doesn't work */
-    BOOST_TEST(inc(123) == 123 + delta);
-    BOOST_TEST(dec(123) == 123 - delta);
-
+    BOOST_TEST(dec(inc(123)) == 123);
     f(delta);
     return boost::report_errors();
 }