diff --git a/doc/sf_and_dist/spherical_harmonic.qbk b/doc/sf_and_dist/spherical_harmonic.qbk
index 3cfc6946c..221615aca 100644
--- a/doc/sf_and_dist/spherical_harmonic.qbk
+++ b/doc/sf_and_dist/spherical_harmonic.qbk
@@ -3,7 +3,7 @@
 [h4 Synopsis]
 
 ``
-#include <boost/math/special_functions/spheric_harmonic.hpp>
+#include <boost/math/special_functions/spherical_harmonic.hpp>
 ``
 
    namespace boost{ namespace math{
diff --git a/include/boost/math/bindings/mpfr.hpp b/include/boost/math/bindings/mpfr.hpp
index 679b83e35..20f0b0369 100644
--- a/include/boost/math/bindings/mpfr.hpp
+++ b/include/boost/math/bindings/mpfr.hpp
@@ -203,6 +203,19 @@ struct lanczos<mpfr_class, Policy>
 
 } // namespace lanczos
 
+namespace constants{
+
+template <class Real, class Policy>
+struct construction_traits;
+
+template <class Policy>
+struct construction_traits<mpfr_class, Policy>
+{
+   typedef mpl::int_<0> type;
+};
+
+}
+
 namespace tools
 {
 
diff --git a/include/boost/math/special_functions/next.hpp b/include/boost/math/special_functions/next.hpp
index b8a5d2ad0..40134b4e4 100644
--- a/include/boost/math/special_functions/next.hpp
+++ b/include/boost/math/special_functions/next.hpp
@@ -275,12 +275,12 @@ T float_distance(const T& a, const T& b, const Policy& pol)
    if(a == b)
       return 0;
    if(a == 0)
-      return 1 + fabs(float_distance(static_cast<T>((b < 0) ? -detail::get_smallest_value<T>() : detail::get_smallest_value<T>()), b, pol));
+      return 1 + fabs(float_distance(static_cast<T>((b < 0) ? T(-detail::get_smallest_value<T>()) : detail::get_smallest_value<T>()), b, pol));
    if(b == 0)
-      return 1 + fabs(float_distance(static_cast<T>((a < 0) ? -detail::get_smallest_value<T>() : detail::get_smallest_value<T>()), a, pol));
+      return 1 + fabs(float_distance(static_cast<T>((a < 0) ? T(-detail::get_smallest_value<T>()) : detail::get_smallest_value<T>()), a, pol));
    if(boost::math::sign(a) != boost::math::sign(b))
-      return 2 + fabs(float_distance(static_cast<T>((b < 0) ? -detail::get_smallest_value<T>() : detail::get_smallest_value<T>()), b, pol))
-         + fabs(float_distance(static_cast<T>((a < 0) ? -detail::get_smallest_value<T>() : detail::get_smallest_value<T>()), a, pol));
+      return 2 + fabs(float_distance(static_cast<T>((b < 0) ? T(-detail::get_smallest_value<T>()) : detail::get_smallest_value<T>()), b, pol))
+         + fabs(float_distance(static_cast<T>((a < 0) ? T(-detail::get_smallest_value<T>()) : detail::get_smallest_value<T>()), a, pol));
    //
    // By the time we get here, both a and b must have the same sign, we want
    // b > a and both postive for the following logic:
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 3792a0a8b..62aeda2eb 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -69,24 +69,24 @@ explicit ntl ;
 cpp-pch pch : pch.hpp : <use>../../test/build//boost_test_exec_monitor ;
 cpp-pch pch_light : pch_light.hpp : <use>../../test/build//boost_test_exec_monitor ;
 
-lib test_instances : float_test_instances.cpp double_test_instances.cpp ldouble_test_instances.cpp real_concept_test_instances.cpp pch 
-                   : <link>static ;
+#lib test_instances : float_test_instances.cpp double_test_instances.cpp ldouble_test_instances.cpp real_concept_test_instances.cpp pch 
+#                   : <link>static ;
 
-run hypot_test.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run hypot_test.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run pow_test.cpp ../../test/build//boost_test_exec_monitor ;
-run log1p_expm1_test.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run powm1_sqrtp1m1_test.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run log1p_expm1_test.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run powm1_sqrtp1m1_test.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run special_functions_test.cpp ../../test/build//boost_unit_test_framework ;
-run test_airy.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_airy.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_bernoulli.cpp ../../test/build//boost_test_exec_monitor ;
 run test_constants.cpp ../../test/build//boost_test_exec_monitor ;
 run test_print_info_on_type.cpp ;
 run test_constant_generate.cpp ntl  : : : [ check-target-builds ../config//has_ntl_rr : : <build>no ] : test_constant_generate_ntl ;
-run test_bessel_j.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_bessel_y.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_bessel_i.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_bessel_k.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_beta.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_bessel_j.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_bessel_y.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_bessel_i.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_bessel_k.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_beta.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_beta_dist.cpp ../../test/build//boost_test_exec_monitor ;
 run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
         : # command line
@@ -166,30 +166,30 @@ run test_binomial.cpp  ../../test/build//boost_test_exec_monitor
 	      <toolset>intel:<pch>off
         : test_binomial_real_concept6 ;
 run test_binomial_coeff.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_carlson.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_carlson.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_cauchy.cpp ../../test/build//boost_test_exec_monitor ;
-run test_cbrt.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_cbrt.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_chi_squared.cpp ../../test/build//boost_test_exec_monitor ;
 run test_classify.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_digamma.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_digamma.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_dist_overloads.cpp ../../test/build//boost_test_exec_monitor ;
-run test_ellint_1.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_ellint_2.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_ellint_3.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_erf.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_ellint_1.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_ellint_2.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_ellint_3.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_erf.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_error_handling.cpp ../../test/build//boost_test_exec_monitor ;
-run test_expint.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_expint.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_exponential_dist.cpp ../../test/build//boost_test_exec_monitor ;
 run test_extreme_value.cpp ../../test/build//boost_test_exec_monitor ;
 run test_factorials.cpp pch ../../test/build//boost_test_exec_monitor ;
 run test_find_location.cpp pch ../../test/build//boost_test_exec_monitor ;
 run test_find_scale.cpp pch ../../test/build//boost_test_exec_monitor ;
 run test_fisher_f.cpp ../../test/build//boost_test_exec_monitor ;
-run test_gamma.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_gamma.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_gamma_dist.cpp pch ../../test/build//boost_test_exec_monitor ;
 run test_geometric.cpp ../../test/build//boost_test_exec_monitor ;
 run test_hankel.cpp ../../test/build//boost_test_exec_monitor ;
-run test_hermite.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_hermite.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_hypergeometric_dist.cpp ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
@@ -232,28 +232,28 @@ run test_hypergeometric_dist.cpp ../../test/build//boost_test_exec_monitor
 	      <define>TEST_QUANT=5
 	      <toolset>intel:<pch>off
         : test_hypergeometric_dist5 ;
-run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_FLOAT
 	      <toolset>intel:<pch>off
         : test_ibeta_float ;
-run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_DOUBLE
 	      <toolset>intel:<pch>off
         : test_ibeta_double ;
-run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_LDOUBLE
 	      <toolset>intel:<pch>off
         : test_ibeta_long_double ;
-run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -261,7 +261,7 @@ run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_m
 	      <define>TEST_DATA=1
 	      <toolset>intel:<pch>off
         : test_ibeta_real_concept1 ;
-run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -269,7 +269,7 @@ run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_m
 	      <define>TEST_DATA=2
 	      <toolset>intel:<pch>off
         : test_ibeta_real_concept2 ;
-run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -277,7 +277,7 @@ run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_m
 	      <define>TEST_DATA=3
 	      <toolset>intel:<pch>off
         : test_ibeta_real_concept3 ;
-run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -285,28 +285,28 @@ run test_ibeta.cpp  test_instances pch_light ../../test/build//boost_test_exec_m
 	      <define>TEST_DATA=4
 	      <toolset>intel:<pch>off
         : test_ibeta_real_concept4 ;
-run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_FLOAT
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_float ;
-run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_DOUBLE
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_double ;
-run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_LDOUBLE
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_long_double ;
-run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -314,7 +314,7 @@ run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_ex
 	      <define>TEST_DATA=1
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_real_concept1 ;
-run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -322,7 +322,7 @@ run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_ex
 	      <define>TEST_DATA=2
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_real_concept2 ;
-run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -330,7 +330,7 @@ run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_ex
 	      <define>TEST_DATA=3
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_real_concept3 ;
-run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -338,28 +338,28 @@ run test_ibeta_inv.cpp  test_instances pch_light ../../test/build//boost_test_ex
 	      <define>TEST_DATA=4
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_real_concept4 ;
-run test_ibeta_inv_ab.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_FLOAT
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_ab_float ;
-run test_ibeta_inv_ab.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_DOUBLE
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_ab_double ;
-run test_ibeta_inv_ab.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_LDOUBLE
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_ab_long_double ;
-run test_ibeta_inv_ab.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -367,7 +367,7 @@ run test_ibeta_inv_ab.cpp  test_instances pch_light ../../test/build//boost_test
 	      <define>TEST_DATA=1
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_ab_real_concept1 ;
-run test_ibeta_inv_ab.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -375,7 +375,7 @@ run test_ibeta_inv_ab.cpp  test_instances pch_light ../../test/build//boost_test
 	      <define>TEST_DATA=2
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_ab_real_concept2 ;
-run test_ibeta_inv_ab.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_ibeta_inv_ab.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -383,57 +383,57 @@ run test_ibeta_inv_ab.cpp test_instances pch_light ../../test/build//boost_test_
 	      <define>TEST_DATA=3
 	      <toolset>intel:<pch>off
         : test_ibeta_inv_ab_real_concept3 ;
-run test_igamma.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_igamma_inv.cpp test_instances pch_light  ../../test/build//boost_test_exec_monitor
+run test_igamma.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_igamma_inv.cpp test_instances//test_instances pch_light  ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_FLOAT
 	      <toolset>intel:<pch>off
         : test_igamma_inv_float ;
-run test_igamma_inv.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_DOUBLE
 	      <toolset>intel:<pch>off
         : test_igamma_inv_double ;
-run test_igamma_inv.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_LDOUBLE
 	      <toolset>intel:<pch>off
         : test_igamma_inv_long_double ;
-run test_igamma_inv.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inv.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_REAL_CONCEPT
 	      <toolset>intel:<pch>off
         : test_igamma_inv_real_concept ;
-run test_igamma_inva.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_FLOAT
 	      <toolset>intel:<pch>off
         : test_igamma_inva_float ;
-run test_igamma_inva.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_DOUBLE
 	      <toolset>intel:<pch>off
         : test_igamma_inva_double ;
-run test_igamma_inva.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
 	      <define>TEST_LDOUBLE
 	      <toolset>intel:<pch>off
         : test_igamma_inva_long_double ;
-run test_igamma_inva.cpp  test_instances pch_light ../../test/build//boost_test_exec_monitor
+run test_igamma_inva.cpp  test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor
         : # command line
         : # input files
         : # requirements
@@ -449,8 +449,8 @@ run test_inverse_gaussian.cpp ../../test/build//boost_test_exec_monitor ;
 run test_jacobi.cpp pch_light ../../test/build//boost_test_exec_monitor ;
 run test_laplace.cpp ../../test/build//boost_unit_test_framework ;
 run test_inv_hyp.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_laguerre.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
-run test_legendre.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_laguerre.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_legendre.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_logistic_dist.cpp ../../test/build//boost_test_exec_monitor ;
 run test_lognormal.cpp ../../test/build//boost_test_exec_monitor ;
 run test_minima.cpp pch ../../test/build//boost_test_exec_monitor ;
@@ -636,7 +636,7 @@ run test_real_concept.cpp ../../test/build//boost_test_exec_monitor ;
 run test_remez.cpp pch ../../test/build//boost_test_exec_monitor ;
 run test_roots.cpp pch ../../test/build//boost_test_exec_monitor ;
 run test_round.cpp pch ../../test/build//boost_test_exec_monitor ;
-run test_spherical_harmonic.cpp test_instances pch_light ../../test/build//boost_test_exec_monitor ;
+run test_spherical_harmonic.cpp test_instances//test_instances pch_light ../../test/build//boost_test_exec_monitor ;
 run test_students_t.cpp ../../test/build//boost_test_exec_monitor ;
 run test_sign.cpp ../../test/build//boost_test_exec_monitor ;
 run test_skew_normal.cpp ../../test/build//boost_test_exec_monitor ;
@@ -645,7 +645,7 @@ run test_toms748_solve.cpp pch ../../test/build//boost_test_exec_monitor ;
 run test_triangular.cpp pch ../../test/build//boost_test_exec_monitor ;
 run test_uniform.cpp pch ../../test/build//boost_test_exec_monitor ;
 run test_weibull.cpp ../../test/build//boost_test_exec_monitor ;
-run test_zeta.cpp test_instances ../../test/build//boost_test_exec_monitor pch_light ;
+run test_zeta.cpp test_instances//test_instances ../../test/build//boost_test_exec_monitor pch_light ;
 
 run test_policy.cpp ../../test/build//boost_test_exec_monitor ;
 run test_policy_2.cpp ../../test/build//boost_test_exec_monitor ;
diff --git a/test/test_gamma_dist.cpp b/test/test_gamma_dist.cpp
index b20652f8c..c213e64c5 100644
--- a/test/test_gamma_dist.cpp
+++ b/test/test_gamma_dist.cpp
@@ -215,11 +215,11 @@ void test_spots(RealType)
     // Rely on default definition in derived accessors.
 
    // error tests
-   check_out_of_range<gamma_distribution<RealType> >(1, 1);
-   BOOST_CHECK_THROW(gamma_distribution<RealType>(0, 1), std::domain_error);
-   BOOST_CHECK_THROW(gamma_distribution<RealType>(-1, 1), std::domain_error);
-   BOOST_CHECK_THROW(gamma_distribution<RealType>(1, 0), std::domain_error);
-   BOOST_CHECK_THROW(gamma_distribution<RealType>(1, -1), std::domain_error);
+   check_out_of_range<boost::math::gamma_distribution<RealType> >(1, 1);
+   BOOST_CHECK_THROW(boost::math::gamma_distribution<RealType>(0, 1), std::domain_error);
+   BOOST_CHECK_THROW(boost::math::gamma_distribution<RealType>(-1, 1), std::domain_error);
+   BOOST_CHECK_THROW(boost::math::gamma_distribution<RealType>(1, 0), std::domain_error);
+   BOOST_CHECK_THROW(boost::math::gamma_distribution<RealType>(1, -1), std::domain_error);
 
 } // template <class RealType>void test_spots(RealType)
 
diff --git a/test/test_instances/Jamfile.v2 b/test/test_instances/Jamfile.v2
new file mode 100644
index 000000000..d40d28bc1
--- /dev/null
+++ b/test/test_instances/Jamfile.v2
@@ -0,0 +1,39 @@
+# Copyright ohn Maddock 2012
+# 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.
+
+import pch ;
+
+project  
+    : requirements 
+      <toolset>acc:<cxxflags>+W2068,2461,2236,4070,4069
+      <toolset>intel-win:<cxxflags>-nologo 
+      <toolset>intel-win:<linkflags>-nologo 
+      #<toolset>intel-linux:<pch>off
+      <toolset>intel-darwin:<pch>off
+      <toolset>msvc:<warnings>all
+      <toolset>msvc:<asynch-exceptions>on
+      <toolset>msvc:<cxxflags>/wd4996
+      <toolset>msvc:<cxxflags>/wd4511 # copy constructor could not be generated 
+      <toolset>msvc:<cxxflags>/wd4512 
+      <toolset>msvc:<cxxflags>/wd4610 
+      <toolset>msvc:<cxxflags>/wd4510 
+      <toolset>msvc:<cxxflags>/wd4127 
+      <toolset>msvc:<cxxflags>/wd4701 # needed for lexical cast - temporary.
+      <toolset>msvc:<cxxflags>/wd4189 # local variable is initialized but not referenced
+      <toolset>msvc-7.1:<pch>off
+      <toolset>borland:<runtime-link>static
+      <include>../../../..
+      # For simplicities sake, make everything a static lib:
+      <link>static
+      <define>BOOST_ALL_NO_LIB=1
+      <include>.
+    ;
+    
+cpp-pch pch : pch.hpp ;
+
+path-constant here : . ;
+
+lib test_instances : [ GLOB $(here) : *.cpp ] pch 
+                   : <link>static ;
diff --git a/test/test_instances/double_test_instances_1.cpp b/test/test_instances/double_test_instances_1.cpp
new file mode 100644
index 000000000..88502559a
--- /dev/null
+++ b/test/test_instances/double_test_instances_1.cpp
@@ -0,0 +1,16 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/beta.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE double
+#define TEST_GROUP_1
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/double_test_instances_10.cpp b/test/test_instances/double_test_instances_10.cpp
new file mode 100644
index 000000000..4df0e855c
--- /dev/null
+++ b/test/test_instances/double_test_instances_10.cpp
@@ -0,0 +1,16 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/jacobi_elliptic.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE double
+#define TEST_GROUP_10
+#include "test_instances.hpp"
+
diff --git a/test/double_test_instances.cpp b/test/test_instances/double_test_instances_2.cpp
similarity index 85%
rename from test/double_test_instances.cpp
rename to test/test_instances/double_test_instances_2.cpp
index 7fb55e7cb..f7e9c3dc8 100644
--- a/test/double_test_instances.cpp
+++ b/test/test_instances/double_test_instances_2.cpp
@@ -7,9 +7,10 @@
 
 #ifndef BOOST_BUILD_PCH_ENABLED
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-#include <boost/math/special_functions.hpp>
+#include <boost/math/special_functions/erf.hpp>
 #endif
 
 #define BOOST_MATH_TEST_TYPE double
+#define TEST_GROUP_2
 #include "test_instances.hpp"
 
diff --git a/test/test_instances/double_test_instances_3.cpp b/test/test_instances/double_test_instances_3.cpp
new file mode 100644
index 000000000..7ed9b56f7
--- /dev/null
+++ b/test/test_instances/double_test_instances_3.cpp
@@ -0,0 +1,19 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/legendre.hpp>
+#include <boost/math/special_functions/laguerre.hpp>
+#include <boost/math/special_functions/hermite.hpp>
+#include <boost/math/special_functions/spherical_harmonic.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE double
+#define TEST_GROUP_3
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/double_test_instances_4.cpp b/test/test_instances/double_test_instances_4.cpp
new file mode 100644
index 000000000..b0ae08221
--- /dev/null
+++ b/test/test_instances/double_test_instances_4.cpp
@@ -0,0 +1,19 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/ellint_rf.hpp>
+#include <boost/math/special_functions/ellint_1.hpp>
+#include <boost/math/special_functions/ellint_2.hpp>
+#include <boost/math/special_functions/ellint_3.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE double
+#define TEST_GROUP_4
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/double_test_instances_5.cpp b/test/test_instances/double_test_instances_5.cpp
new file mode 100644
index 000000000..3c4d0a336
--- /dev/null
+++ b/test/test_instances/double_test_instances_5.cpp
@@ -0,0 +1,17 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/gamma.hpp>
+#include <boost/math/special_functions/digamma.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE double
+#define TEST_GROUP_5
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/double_test_instances_6.cpp b/test/test_instances/double_test_instances_6.cpp
new file mode 100644
index 000000000..2edbc5d37
--- /dev/null
+++ b/test/test_instances/double_test_instances_6.cpp
@@ -0,0 +1,21 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/hypot.hpp>
+#include <boost/math/special_functions/cbrt.hpp>
+#include <boost/math/special_functions/log1p.hpp>
+#include <boost/math/special_functions/expm1.hpp>
+#include <boost/math/special_functions/powm1.hpp>
+#include <boost/math/special_functions/sqrt1pm1.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE double
+#define TEST_GROUP_6
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/double_test_instances_7.cpp b/test/test_instances/double_test_instances_7.cpp
new file mode 100644
index 000000000..397280638
--- /dev/null
+++ b/test/test_instances/double_test_instances_7.cpp
@@ -0,0 +1,16 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/bessel.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE double
+#define TEST_GROUP_7
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/double_test_instances_8.cpp b/test/test_instances/double_test_instances_8.cpp
new file mode 100644
index 000000000..727a12e78
--- /dev/null
+++ b/test/test_instances/double_test_instances_8.cpp
@@ -0,0 +1,16 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/airy.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE double
+#define TEST_GROUP_8
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/double_test_instances_9.cpp b/test/test_instances/double_test_instances_9.cpp
new file mode 100644
index 000000000..e14c85dbf
--- /dev/null
+++ b/test/test_instances/double_test_instances_9.cpp
@@ -0,0 +1,17 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/expint.hpp>
+#include <boost/math/special_functions/zeta.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE double
+#define TEST_GROUP_9
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/float_test_instances_1.cpp b/test/test_instances/float_test_instances_1.cpp
new file mode 100644
index 000000000..774e71fe5
--- /dev/null
+++ b/test/test_instances/float_test_instances_1.cpp
@@ -0,0 +1,16 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/beta.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE float
+#define TEST_GROUP_1
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/float_test_instances_10.cpp b/test/test_instances/float_test_instances_10.cpp
new file mode 100644
index 000000000..0afafd3b8
--- /dev/null
+++ b/test/test_instances/float_test_instances_10.cpp
@@ -0,0 +1,16 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/jacobi_elliptic.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE float
+#define TEST_GROUP_10
+#include "test_instances.hpp"
+
diff --git a/test/float_test_instances.cpp b/test/test_instances/float_test_instances_2.cpp
similarity index 85%
rename from test/float_test_instances.cpp
rename to test/test_instances/float_test_instances_2.cpp
index dfeb4666e..4f9690581 100644
--- a/test/float_test_instances.cpp
+++ b/test/test_instances/float_test_instances_2.cpp
@@ -7,9 +7,10 @@
 
 #ifndef BOOST_BUILD_PCH_ENABLED
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-#include <boost/math/special_functions.hpp>
+#include <boost/math/special_functions/erf.hpp>
 #endif
 
 #define BOOST_MATH_TEST_TYPE float
+#define TEST_GROUP_2
 #include "test_instances.hpp"
 
diff --git a/test/test_instances/float_test_instances_3.cpp b/test/test_instances/float_test_instances_3.cpp
new file mode 100644
index 000000000..6623f7c17
--- /dev/null
+++ b/test/test_instances/float_test_instances_3.cpp
@@ -0,0 +1,19 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/legendre.hpp>
+#include <boost/math/special_functions/laguerre.hpp>
+#include <boost/math/special_functions/hermite.hpp>
+#include <boost/math/special_functions/spherical_harmonic.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE float
+#define TEST_GROUP_3
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/float_test_instances_4.cpp b/test/test_instances/float_test_instances_4.cpp
new file mode 100644
index 000000000..7ade3cce0
--- /dev/null
+++ b/test/test_instances/float_test_instances_4.cpp
@@ -0,0 +1,19 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/ellint_rf.hpp>
+#include <boost/math/special_functions/ellint_1.hpp>
+#include <boost/math/special_functions/ellint_2.hpp>
+#include <boost/math/special_functions/ellint_3.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE float
+#define TEST_GROUP_4
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/float_test_instances_5.cpp b/test/test_instances/float_test_instances_5.cpp
new file mode 100644
index 000000000..13e9e34f3
--- /dev/null
+++ b/test/test_instances/float_test_instances_5.cpp
@@ -0,0 +1,17 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/gamma.hpp>
+#include <boost/math/special_functions/digamma.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE float
+#define TEST_GROUP_5
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/float_test_instances_6.cpp b/test/test_instances/float_test_instances_6.cpp
new file mode 100644
index 000000000..580a9adac
--- /dev/null
+++ b/test/test_instances/float_test_instances_6.cpp
@@ -0,0 +1,21 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/hypot.hpp>
+#include <boost/math/special_functions/cbrt.hpp>
+#include <boost/math/special_functions/log1p.hpp>
+#include <boost/math/special_functions/expm1.hpp>
+#include <boost/math/special_functions/powm1.hpp>
+#include <boost/math/special_functions/sqrt1pm1.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE float
+#define TEST_GROUP_6
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/float_test_instances_7.cpp b/test/test_instances/float_test_instances_7.cpp
new file mode 100644
index 000000000..4c25477b7
--- /dev/null
+++ b/test/test_instances/float_test_instances_7.cpp
@@ -0,0 +1,16 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/bessel.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE float
+#define TEST_GROUP_7
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/float_test_instances_8.cpp b/test/test_instances/float_test_instances_8.cpp
new file mode 100644
index 000000000..a0b36a854
--- /dev/null
+++ b/test/test_instances/float_test_instances_8.cpp
@@ -0,0 +1,16 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/airy.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE float
+#define TEST_GROUP_8
+#include "test_instances.hpp"
+
diff --git a/test/test_instances/float_test_instances_9.cpp b/test/test_instances/float_test_instances_9.cpp
new file mode 100644
index 000000000..e2eb15c3d
--- /dev/null
+++ b/test/test_instances/float_test_instances_9.cpp
@@ -0,0 +1,17 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/expint.hpp>
+#include <boost/math/special_functions/zeta.hpp>
+#endif
+
+#define BOOST_MATH_TEST_TYPE float
+#define TEST_GROUP_9
+#include "test_instances.hpp"
+
diff --git a/test/ldouble_test_instances.cpp b/test/test_instances/ldouble_test_instances_10.cpp
similarity index 84%
rename from test/ldouble_test_instances.cpp
rename to test/test_instances/ldouble_test_instances_10.cpp
index 6391fe6d8..8e21808ed 100644
--- a/test/ldouble_test_instances.cpp
+++ b/test/test_instances/ldouble_test_instances_10.cpp
@@ -7,14 +7,13 @@
 
 #ifndef BOOST_BUILD_PCH_ENABLED
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-#include <boost/math/special_functions.hpp>
+#include <boost/math/special_functions/jacobi_elliptic.hpp>
 #endif
 
-#include <boost/math/tools/config.hpp>
-
 #ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 
 #define BOOST_MATH_TEST_TYPE long double
+#define TEST_GROUP_10
 #include "test_instances.hpp"
 
 #endif
diff --git a/test/test_instances/ldouble_test_instances_2.cpp b/test/test_instances/ldouble_test_instances_2.cpp
new file mode 100644
index 000000000..a49d0ea7a
--- /dev/null
+++ b/test/test_instances/ldouble_test_instances_2.cpp
@@ -0,0 +1,19 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/erf.hpp>
+#endif
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE long double
+#define TEST_GROUP_2
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/ldouble_test_instances_3.cpp b/test/test_instances/ldouble_test_instances_3.cpp
new file mode 100644
index 000000000..9400bbdaf
--- /dev/null
+++ b/test/test_instances/ldouble_test_instances_3.cpp
@@ -0,0 +1,22 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/legendre.hpp>
+#include <boost/math/special_functions/laguerre.hpp>
+#include <boost/math/special_functions/hermite.hpp>
+#include <boost/math/special_functions/spherical_harmonic.hpp>
+#endif
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE long double
+#define TEST_GROUP_3
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/ldouble_test_instances_4.cpp b/test/test_instances/ldouble_test_instances_4.cpp
new file mode 100644
index 000000000..8596661c6
--- /dev/null
+++ b/test/test_instances/ldouble_test_instances_4.cpp
@@ -0,0 +1,22 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/ellint_rf.hpp>
+#include <boost/math/special_functions/ellint_1.hpp>
+#include <boost/math/special_functions/ellint_2.hpp>
+#include <boost/math/special_functions/ellint_3.hpp>
+#endif
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE long double
+#define TEST_GROUP_4
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/ldouble_test_instances_5.cpp b/test/test_instances/ldouble_test_instances_5.cpp
new file mode 100644
index 000000000..5e0e04c23
--- /dev/null
+++ b/test/test_instances/ldouble_test_instances_5.cpp
@@ -0,0 +1,20 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/gamma.hpp>
+#include <boost/math/special_functions/digamma.hpp>
+#endif
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE long double
+#define TEST_GROUP_5
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/ldouble_test_instances_6.cpp b/test/test_instances/ldouble_test_instances_6.cpp
new file mode 100644
index 000000000..5a03396b2
--- /dev/null
+++ b/test/test_instances/ldouble_test_instances_6.cpp
@@ -0,0 +1,24 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/hypot.hpp>
+#include <boost/math/special_functions/cbrt.hpp>
+#include <boost/math/special_functions/log1p.hpp>
+#include <boost/math/special_functions/expm1.hpp>
+#include <boost/math/special_functions/powm1.hpp>
+#include <boost/math/special_functions/sqrt1pm1.hpp>
+#endif
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE long double
+#define TEST_GROUP_6
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/ldouble_test_instances_7.cpp b/test/test_instances/ldouble_test_instances_7.cpp
new file mode 100644
index 000000000..998dc01a4
--- /dev/null
+++ b/test/test_instances/ldouble_test_instances_7.cpp
@@ -0,0 +1,19 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/bessel.hpp>
+#endif
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE long double
+#define TEST_GROUP_7
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/ldouble_test_instances_8.cpp b/test/test_instances/ldouble_test_instances_8.cpp
new file mode 100644
index 000000000..98c703348
--- /dev/null
+++ b/test/test_instances/ldouble_test_instances_8.cpp
@@ -0,0 +1,19 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/airy.hpp>
+#endif
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE long double
+#define TEST_GROUP_8
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/ldouble_test_instances_9.cpp b/test/test_instances/ldouble_test_instances_9.cpp
new file mode 100644
index 000000000..e212c7d5e
--- /dev/null
+++ b/test/test_instances/ldouble_test_instances_9.cpp
@@ -0,0 +1,20 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/expint.hpp>
+#include <boost/math/special_functions/zeta.hpp>
+#endif
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE long double
+#define TEST_GROUP_9
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/long_double_test_instances_1.cpp b/test/test_instances/long_double_test_instances_1.cpp
new file mode 100644
index 000000000..a312ae080
--- /dev/null
+++ b/test/test_instances/long_double_test_instances_1.cpp
@@ -0,0 +1,19 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/beta.hpp>
+#endif
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE long double
+#define TEST_GROUP_1
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/pch.hpp b/test/test_instances/pch.hpp
new file mode 100644
index 000000000..827a31967
--- /dev/null
+++ b/test/test_instances/pch.hpp
@@ -0,0 +1,10 @@
+//  Copyright John Maddock 2012.
+//  Use, modification and distribution are 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)
+
+#ifdef BOOST_BUILD_PCH_ENABLED
+
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions.hpp>
+#endif
diff --git a/test/test_instances/real_concept_test_instances_1.cpp b/test/test_instances/real_concept_test_instances_1.cpp
new file mode 100644
index 000000000..76b1a7bb5
--- /dev/null
+++ b/test/test_instances/real_concept_test_instances_1.cpp
@@ -0,0 +1,22 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/beta.hpp>
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/concepts/real_concept.hpp>
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE boost::math::concepts::real_concept
+#define TEST_GROUP_1
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/real_concept_test_instances_10.cpp b/test/test_instances/real_concept_test_instances_10.cpp
new file mode 100644
index 000000000..e356b046a
--- /dev/null
+++ b/test/test_instances/real_concept_test_instances_10.cpp
@@ -0,0 +1,22 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/jacobi_elliptic.hpp>
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/concepts/real_concept.hpp>
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE boost::math::concepts::real_concept
+#define TEST_GROUP_10
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/real_concept_test_instances.cpp b/test/test_instances/real_concept_test_instances_2.cpp
similarity index 89%
rename from test/real_concept_test_instances.cpp
rename to test/test_instances/real_concept_test_instances_2.cpp
index 2adc711ec..6cb2ecc97 100644
--- a/test/real_concept_test_instances.cpp
+++ b/test/test_instances/real_concept_test_instances_2.cpp
@@ -7,7 +7,7 @@
 
 #ifndef BOOST_BUILD_PCH_ENABLED
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
-#include <boost/math/special_functions.hpp>
+#include <boost/math/special_functions/erf.hpp>
 #endif
 
 #include <boost/math/tools/config.hpp>
@@ -16,6 +16,7 @@
 #ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 
 #define BOOST_MATH_TEST_TYPE boost::math::concepts::real_concept
+#define TEST_GROUP_2
 #include "test_instances.hpp"
 
 #endif
diff --git a/test/test_instances/real_concept_test_instances_3.cpp b/test/test_instances/real_concept_test_instances_3.cpp
new file mode 100644
index 000000000..aa6cf8fb7
--- /dev/null
+++ b/test/test_instances/real_concept_test_instances_3.cpp
@@ -0,0 +1,25 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/legendre.hpp>
+#include <boost/math/special_functions/laguerre.hpp>
+#include <boost/math/special_functions/hermite.hpp>
+#include <boost/math/special_functions/spherical_harmonic.hpp>
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/concepts/real_concept.hpp>
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE boost::math::concepts::real_concept
+#define TEST_GROUP_3
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/real_concept_test_instances_4.cpp b/test/test_instances/real_concept_test_instances_4.cpp
new file mode 100644
index 000000000..346975a6c
--- /dev/null
+++ b/test/test_instances/real_concept_test_instances_4.cpp
@@ -0,0 +1,25 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/ellint_rf.hpp>
+#include <boost/math/special_functions/ellint_1.hpp>
+#include <boost/math/special_functions/ellint_2.hpp>
+#include <boost/math/special_functions/ellint_3.hpp>
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/concepts/real_concept.hpp>
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE boost::math::concepts::real_concept
+#define TEST_GROUP_4
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/real_concept_test_instances_5.cpp b/test/test_instances/real_concept_test_instances_5.cpp
new file mode 100644
index 000000000..14fc0909b
--- /dev/null
+++ b/test/test_instances/real_concept_test_instances_5.cpp
@@ -0,0 +1,23 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/gamma.hpp>
+#include <boost/math/special_functions/digamma.hpp>
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/concepts/real_concept.hpp>
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE boost::math::concepts::real_concept
+#define TEST_GROUP_5
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/real_concept_test_instances_6.cpp b/test/test_instances/real_concept_test_instances_6.cpp
new file mode 100644
index 000000000..05ad5324b
--- /dev/null
+++ b/test/test_instances/real_concept_test_instances_6.cpp
@@ -0,0 +1,27 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/hypot.hpp>
+#include <boost/math/special_functions/cbrt.hpp>
+#include <boost/math/special_functions/log1p.hpp>
+#include <boost/math/special_functions/expm1.hpp>
+#include <boost/math/special_functions/powm1.hpp>
+#include <boost/math/special_functions/sqrt1pm1.hpp>
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/concepts/real_concept.hpp>
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE boost::math::concepts::real_concept
+#define TEST_GROUP_6
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/real_concept_test_instances_7.cpp b/test/test_instances/real_concept_test_instances_7.cpp
new file mode 100644
index 000000000..a56647908
--- /dev/null
+++ b/test/test_instances/real_concept_test_instances_7.cpp
@@ -0,0 +1,22 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/bessel.hpp>
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/concepts/real_concept.hpp>
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE boost::math::concepts::real_concept
+#define TEST_GROUP_7
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/real_concept_test_instances_8.cpp b/test/test_instances/real_concept_test_instances_8.cpp
new file mode 100644
index 000000000..ff03f4d25
--- /dev/null
+++ b/test/test_instances/real_concept_test_instances_8.cpp
@@ -0,0 +1,22 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/airy.hpp>
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/concepts/real_concept.hpp>
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE boost::math::concepts::real_concept
+#define TEST_GROUP_8
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances/real_concept_test_instances_9.cpp b/test/test_instances/real_concept_test_instances_9.cpp
new file mode 100644
index 000000000..05ac1f777
--- /dev/null
+++ b/test/test_instances/real_concept_test_instances_9.cpp
@@ -0,0 +1,23 @@
+// Copyright John Maddock 2011.
+//  Use, modification and distribution are 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)
+
+#include "pch.hpp"
+
+#ifndef BOOST_BUILD_PCH_ENABLED
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
+#include <boost/math/special_functions/expint.hpp>
+#include <boost/math/special_functions/zeta.hpp>
+#endif
+
+#include <boost/math/tools/config.hpp>
+#include <boost/math/concepts/real_concept.hpp>
+
+#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_MATH_TEST_TYPE boost::math::concepts::real_concept
+#define TEST_GROUP_9
+#include "test_instances.hpp"
+
+#endif
diff --git a/test/test_instances.hpp b/test/test_instances/test_instances.hpp
similarity index 99%
rename from test/test_instances.hpp
rename to test/test_instances/test_instances.hpp
index f2c73da9e..4b5a5dcab 100644
--- a/test/test_instances.hpp
+++ b/test/test_instances/test_instances.hpp
@@ -8,6 +8,8 @@ namespace boost{ namespace math{
 
    typedef policies::policy<policies::overflow_error<policies::throw_on_error> > overflow_policy;
 
+#ifdef TEST_GROUP_1
+
    // Beta functions.
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type 
          beta(BOOST_MATH_TEST_TYPE a, BOOST_MATH_TEST_TYPE b); // Beta function (2 arguments).
@@ -92,6 +94,8 @@ namespace boost{ namespace math{
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type 
          ibeta_derivative(BOOST_MATH_TEST_TYPE a, BOOST_MATH_TEST_TYPE b, BOOST_MATH_TEST_TYPE x, const policies::policy<>& pol);  // derivative of incomplete beta
 
+#endif
+#ifdef TEST_GROUP_2
    // erf & erfc error functions.
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type erf(BOOST_MATH_TEST_TYPE z);
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type erf(BOOST_MATH_TEST_TYPE z, const policies::policy<>&);
@@ -104,7 +108,8 @@ namespace boost{ namespace math{
 
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type erfc_inv(BOOST_MATH_TEST_TYPE z);
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type erfc_inv(BOOST_MATH_TEST_TYPE z, const policies::policy<>& pol);
-
+#endif
+#ifdef TEST_GROUP_3
    // Polynomials:
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type 
          legendre_next(unsigned l, BOOST_MATH_TEST_TYPE x, BOOST_MATH_TEST_TYPE Pl, BOOST_MATH_TEST_TYPE Plm1);
@@ -174,7 +179,8 @@ namespace boost{ namespace math{
 
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type 
       spherical_harmonic_i(unsigned n, int m, BOOST_MATH_TEST_TYPE theta, BOOST_MATH_TEST_TYPE phi, const policies::policy<>& pol);
-
+#endif
+#ifdef TEST_GROUP_4
     // Elliptic integrals:
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type 
          ellint_rf(BOOST_MATH_TEST_TYPE x, BOOST_MATH_TEST_TYPE y, BOOST_MATH_TEST_TYPE z);
@@ -217,7 +223,8 @@ namespace boost{ namespace math{
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type ellint_3(BOOST_MATH_TEST_TYPE k, BOOST_MATH_TEST_TYPE v, BOOST_MATH_TEST_TYPE phi, const policies::policy<>& pol);
 
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type ellint_3(BOOST_MATH_TEST_TYPE k, BOOST_MATH_TEST_TYPE v);
-
+#endif
+#ifdef TEST_GROUP_5
    // Gamma functions.
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type tgamma(BOOST_MATH_TEST_TYPE z);
 
@@ -282,7 +289,8 @@ namespace boost{ namespace math{
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type digamma(BOOST_MATH_TEST_TYPE x);
 
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type digamma(BOOST_MATH_TEST_TYPE x, const policies::policy<>&);
-
+#endif
+#ifdef TEST_GROUP_6
    // Hypotenuse function sqrt(x ^ 2 + y ^ 2).
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type 
          hypot(BOOST_MATH_TEST_TYPE x, BOOST_MATH_TEST_TYPE y);
@@ -324,7 +332,8 @@ namespace boost{ namespace math{
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type sqrt1pm1(const BOOST_MATH_TEST_TYPE& val);
 
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type sqrt1pm1(const BOOST_MATH_TEST_TYPE& val, const policies::policy<>&);
-
+#endif
+#ifdef TEST_GROUP_7
    // Bessel functions:
    template detail::bessel_traits<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE, policies::policy<> >::result_type cyl_bessel_j(BOOST_MATH_TEST_TYPE v, BOOST_MATH_TEST_TYPE x, const policies::policy<> & pol);
 
@@ -353,7 +362,8 @@ namespace boost{ namespace math{
    template detail::bessel_traits<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE, policies::policy<> >::result_type sph_neumann(unsigned v, BOOST_MATH_TEST_TYPE x, const policies::policy<> & pol);
 
    template detail::bessel_traits<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE, policies::policy<> >::result_type sph_neumann(unsigned v, BOOST_MATH_TEST_TYPE x);
-
+#endif
+#ifdef TEST_GROUP_8
    // Airy Functions:
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type airy_ai(BOOST_MATH_TEST_TYPE x, const policies::policy<>&);
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type airy_ai(BOOST_MATH_TEST_TYPE x);
@@ -363,7 +373,8 @@ namespace boost{ namespace math{
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type airy_ai_prime(BOOST_MATH_TEST_TYPE x);
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type airy_bi_prime(BOOST_MATH_TEST_TYPE x, const policies::policy<>&);
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type airy_bi_prime(BOOST_MATH_TEST_TYPE x);
-
+#endif
+#ifdef TEST_GROUP_9
    // Exponential Integral
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type expint(unsigned n, BOOST_MATH_TEST_TYPE z, const policies::policy<> &);
 
@@ -375,7 +386,8 @@ namespace boost{ namespace math{
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type zeta(BOOST_MATH_TEST_TYPE s, const policies::policy<>&);
 
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type zeta(BOOST_MATH_TEST_TYPE s);
-
+#endif
+#ifdef TEST_GROUP_10
    // Jacobi Functions:
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type jacobi_elliptic(BOOST_MATH_TEST_TYPE k, BOOST_MATH_TEST_TYPE theta, BOOST_MATH_TEST_TYPE* pcn, BOOST_MATH_TEST_TYPE* pdn, const policies::policy<>&);
    template tools::promote_args<BOOST_MATH_TEST_TYPE>::type jacobi_elliptic(BOOST_MATH_TEST_TYPE k, BOOST_MATH_TEST_TYPE theta, BOOST_MATH_TEST_TYPE* pcn, BOOST_MATH_TEST_TYPE* pdn);
@@ -403,5 +415,6 @@ namespace boost{ namespace math{
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type jacobi_sc(BOOST_MATH_TEST_TYPE k, BOOST_MATH_TEST_TYPE theta);
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type jacobi_cs(BOOST_MATH_TEST_TYPE k, BOOST_MATH_TEST_TYPE theta, const policies::policy<>& pol);
    template tools::promote_args<BOOST_MATH_TEST_TYPE, BOOST_MATH_TEST_TYPE>::type jacobi_cs(BOOST_MATH_TEST_TYPE k, BOOST_MATH_TEST_TYPE theta);
+#endif
 
 }} // namespaces