diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 8248520..3b0d68d 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -96,36 +96,32 @@ alias preprocessor_number_512
 
 alias preprocessor_v_128
    :   
-        [ compile array.cpp : <define>BOOST_PP_LIMIT_VARIADIC=128 : array_v_128 ]
-        [ compile tuple.cpp : <define>BOOST_PP_LIMIT_VARIADIC=128 : tuple_v_128 ]
+        [ compile array.cpp : <define>BOOST_PP_LIMIT_TUPLE=128 : array_v_128 ]
+        [ compile tuple.cpp : <define>BOOST_PP_LIMIT_TUPLE=128 : tuple_v_128 ]
         [ compile variadic.cpp : <define>BOOST_PP_LIMIT_VARIADIC=128 : variadic_v_128 ]
   ;
 
 alias preprocessor_v_256
    :   
-        [ compile array.cpp : <define>BOOST_PP_LIMIT_VARIADIC=256 : array_v_256 ]
-        [ compile tuple.cpp : <define>BOOST_PP_LIMIT_VARIADIC=256 : tuple_v_256 ]
+        [ compile array.cpp : <define>BOOST_PP_LIMIT_TUPLE=256 : array_v_256 ]
+        [ compile tuple.cpp : <define>BOOST_PP_LIMIT_TUPLE=256 : tuple_v_256 ]
         [ compile variadic.cpp : <define>BOOST_PP_LIMIT_VARIADIC=256 : variadic_v_256 ]
   ;
   
 alias preprocessor_v_128_c
    :   
-        [ compile array.c : <define>BOOST_PP_LIMIT_VARIADIC=128 : array_v_128_c ]
-        [ compile tuple.c : <define>BOOST_PP_LIMIT_VARIADIC=128 : tuple_v_128_c ]
+        [ compile array.c : <define>BOOST_PP_LIMIT_TUPLE=128 : array_v_128_c ]
+        [ compile tuple.c : <define>BOOST_PP_LIMIT_TUPLE=128 : tuple_v_128_c ]
         [ compile variadic.c : <define>BOOST_PP_LIMIT_VARIADIC=128 : variadic_v_128_c ]
   ;
 
-#|
-
 alias preprocessor_v_256_c
    :   
-        [ compile array.c : <define>BOOST_PP_LIMIT_VARIADIC=256 : array_v_256_c ]
-        [ compile tuple.c : <define>BOOST_PP_LIMIT_VARIADIC=256 : tuple_v_256_c ]
+        [ compile array.c : <define>BOOST_PP_LIMIT_TUPLE=256 : array_v_256_c ]
+        [ compile tuple.c : <define>BOOST_PP_LIMIT_TUPLE=256 : tuple_v_256_c ]
         [ compile variadic.c : <define>BOOST_PP_LIMIT_VARIADIC=256 : variadic_v_256_c ]
   ;
   
-|#
-
 alias preprocessor_number_nvm_512
    :   
         [ compile arithmetic.cpp : <define>BOOST_PP_LIMIT_MAG=512 <define>BOOST_PP_VARIADICS=0 : arithmetic_nvm_num ]
diff --git a/test/arithmetic.cxx b/test/arithmetic.cxx
index f097769..3612636 100644
--- a/test/arithmetic.cxx
+++ b/test/arithmetic.cxx
@@ -9,8 +9,8 @@
 #
 # /* See http://www.boost.org for most recent version. */
 #
-# include <boost/preprocessor/arithmetic.hpp>
 # include <boost/preprocessor/config/limits.hpp>
+# include <boost/preprocessor/arithmetic.hpp>
 # include <libs/preprocessor/test/test.h>
 
 /* addition */
@@ -21,12 +21,6 @@ BEGIN BOOST_PP_ADD(BOOST_PP_ADD(2, 2), 2) == 6 END
 BEGIN BOOST_PP_ADD(2, BOOST_PP_ADD(1, 4)) == 7 END
 BEGIN BOOST_PP_ADD(BOOST_PP_ADD(2, 2), BOOST_PP_ADD(2, 2)) == 8 END
 
-#if BOOST_PP_LIMIT_MAG == 256
-
-BEGIN BOOST_PP_ADD(149, BOOST_PP_ADD(102, 137)) == 256 END
-
-#endif
-
 #if BOOST_PP_LIMIT_MAG == 512
 
 BEGIN BOOST_PP_ADD(374, 129) == 503 END