diff --git a/.travis.yml b/.travis.yml
index 131d5ba133..5c3f6d59d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,137 +27,395 @@ matrix:
     - env: BOGUS_JOB=true
 
   include:
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=special_fun
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=special_fun
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=special_fun
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=special_fun
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=distribution_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=distribution_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=distribution_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=distribution_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=special_fun
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=special_fun
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=special_fun
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=special_fun
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=distribution_tests
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=distribution_tests
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=distribution_tests
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=distribution_tests
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: bionic
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE="quadrature include=/usr/include/eigen3"
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+            - libeigen3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: bionic
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE="quadrature include=/usr/include/eigen3"
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+            - libeigen3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: bionic
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE="quadrature include=/usr/include/eigen3"
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+            - libeigen3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: bionic
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=gnu++14 TEST_SUITE="quadrature include=/usr/include/eigen3"
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+            - libeigen3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: bionic
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE="quadrature include=/usr/include/eigen3"
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+            - libeigen3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=float128_tests
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=float128_tests
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=float128_tests
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=gnu++14 TEST_SUITE=float128_tests
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=float128_tests
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=../example//examples
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=../tools
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=../example//examples
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=../tools
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=../example//examples
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=../tools
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=gnu++14 TEST_SUITE=../example//examples
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=gnu++14 TEST_SUITE=../tools
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=../example//examples
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=../tools
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=special_fun
+      addons:
+        apt:
+          packages:
+            - g++-5
+            - libgmp-dev
+            - libmpfr-dev
+            - libfftw3-dev
+          sources:
+            - ubuntu-toolchain-r-test
 
     - os: linux
-      dist: bionic
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE="quadrature include=/usr/include/eigen3"
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=distribution_tests
       addons:
         apt:
           packages:
-            - g++-6
+            - g++-5
             - libgmp-dev
             - libmpfr-dev
             - libfftw3-dev
-            - libeigen3-dev
           sources:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      dist: bionic
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE="quadrature include=/usr/include/eigen3"
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=misc
       addons:
         apt:
           packages:
-            - g++-6
+            - g++-5
             - libgmp-dev
             - libmpfr-dev
             - libfftw3-dev
-            - libeigen3-dev
           sources:
             - ubuntu-toolchain-r-test
 
     - os: linux
       dist: bionic
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE="quadrature include=/usr/include/eigen3"
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE="quadrature include=/usr/include/eigen3"
       addons:
         apt:
           packages:
-            - g++-6
+            - g++-5
             - libgmp-dev
             - libmpfr-dev
             - libfftw3-dev
@@ -166,252 +424,31 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      dist: bionic
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=gnu++14 TEST_SUITE="quadrature include=/usr/include/eigen3"
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=float128_tests
       addons:
         apt:
           packages:
-            - g++-6
+            - g++-5
             - libgmp-dev
             - libmpfr-dev
             - libfftw3-dev
-            - libeigen3-dev
           sources:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      dist: bionic
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE="quadrature include=/usr/include/eigen3"
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=../example//examples
       addons:
         apt:
           packages:
-            - g++-6
+            - g++-5
             - libgmp-dev
             - libmpfr-dev
             - libfftw3-dev
-            - libeigen3-dev
           sources:
             - ubuntu-toolchain-r-test
 
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=float128_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=float128_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=float128_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=gnu++14 TEST_SUITE=float128_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=float128_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=../example//examples
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=../tools
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=../example//examples
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=../tools
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=../example//examples
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=../tools
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=gnu++14 TEST_SUITE=../example//examples
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=gnu++14 TEST_SUITE=../tools
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=../example//examples
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=../tools
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-6
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=special_fun
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-5
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=distribution_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-5
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=misc
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-5
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
     - os: linux
-      dist: bionic
-      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE="quadrature include=/usr/include/eigen3"
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=../tools
       addons:
         apt:
           packages:
@@ -419,78 +456,41 @@ matrix:
             - libgmp-dev
             - libmpfr-dev
             - libfftw3-dev
-            - libeigen3-dev
           sources:
             - ubuntu-toolchain-r-test
 
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=float128_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-5
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=../example//examples
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-5
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=../tools
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-5
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #         - libfftw3-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=special_fun
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=distribution_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=misc
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=special_fun
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=distribution_tests
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: bionic
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=misc
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
 
     - os: linux
       dist: bionic
@@ -504,73 +504,73 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=float128_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=../example//examples
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=../tools
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=special_fun
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=distribution_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=misc
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=float128_tests
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=../example//examples
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=c++14 TEST_SUITE=../tools
+      addons:
+        apt:
+          packages:
+            - g++-8
+            - libgmp-dev
+            - libmpfr-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=special_fun
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=distribution_tests
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: bionic
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=misc
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
 
     - os: linux
       dist: bionic
@@ -584,62 +584,62 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=float128_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=../example//examples
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=../tools
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++17 TEST_SUITE=special_fun
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++17 TEST_SUITE=distribution_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=float128_tests
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=../example//examples
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++03 TEST_SUITE=../tools
+      addons:
+        apt:
+          packages:
+            - g++-8
+            - libgmp-dev
+            - libmpfr-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++17 TEST_SUITE=special_fun
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: bionic
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++17 TEST_SUITE=distribution_tests
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
 
     - os: linux
       dist: bionic
@@ -653,73 +653,73 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++17 TEST_SUITE=float128_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++17 TEST_SUITE=../example//examples
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   dist: trusty
-    #   compiler: g++-8
-    #   env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++17 TEST_SUITE=../tools
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - g++-8
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-
-    # - os: linux
-    #   compiler: clang++-6.0
-    #   env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=c++11 TEST_SUITE=special_fun
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - clang-6.0
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-    #         - llvm-toolchain-xenial-6.0
-
-    # - os: linux
-    #   compiler: clang++-6.0
-    #   env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=c++11 TEST_SUITE=distribution_tests
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - clang-6.0
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-    #         - llvm-toolchain-xenial-6.0
-
-    # - os: linux
-    #   compiler: clang++-6.0
-    #   env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=c++11 TEST_SUITE=misc
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - clang-6.0
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-    #         - llvm-toolchain-xenial-6.0
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++17 TEST_SUITE=float128_tests
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++17 TEST_SUITE=../example//examples
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=gnu++17 TEST_SUITE=../tools
+      addons:
+        apt:
+          packages:
+            - g++-8
+            - libgmp-dev
+            - libmpfr-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: clang++-6.0
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=c++11 TEST_SUITE=special_fun
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-6.0
+
+    - os: linux
+      compiler: clang++-6.0
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=c++11 TEST_SUITE=distribution_tests
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-6.0
+
+    - os: linux
+      compiler: clang++-6.0
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=c++11 TEST_SUITE=misc
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-6.0
 
     - os: linux
       dist: bionic
@@ -734,41 +734,41 @@ matrix:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-xenial-6.0
 
-    # - os: linux
-    #   compiler: clang++-6.0
-    #   env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=c++11 TEST_SUITE=../example//examples
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - clang-6.0
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-    #         - llvm-toolchain-xenial-6.0
-
-    # - os: linux
-    #   compiler: clang++-6.0
-    #   env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=c++11 TEST_SUITE=../tools
-    #   addons:
-    #     apt:
-    #       packages:
-    #         - clang-6.0
-    #         - libgmp-dev
-    #         - libmpfr-dev
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-    #         - llvm-toolchain-xenial-6.0
-
-    # - os: osx
-    #   env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=special_fun
-    #   osx_image: xcode11
-
-    # - os: osx
-    #   env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=distribution_tests
-    #   osx_image: xcode11
-
-    # - os: osx
-    #   env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=misc
-    #   osx_image: xcode11
+    - os: linux
+      compiler: clang++-6.0
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=c++11 TEST_SUITE=../example//examples
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-6.0
+
+    - os: linux
+      compiler: clang++-6.0
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=c++11 TEST_SUITE=../tools
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+            - libgmp-dev
+            - libmpfr-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-6.0
+
+    - os: osx
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=special_fun
+      osx_image: xcode11
+
+    - os: osx
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=distribution_tests
+      osx_image: xcode11
+
+    - os: osx
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=misc
+      osx_image: xcode11
 
     - os: osx
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE="quadrature include=/usr/local/include/eigen3"
@@ -778,13 +778,13 @@ matrix:
           packages:
             eigen
 
-    # - os: osx
-    #   env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=float128_tests
-    #   osx_image: xcode11
+    - os: osx
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=float128_tests
+      osx_image: xcode11
 
-    # - os: osx
-    #   env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=../example//examples
-    #   osx_image: xcode11
+    - os: osx
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=../example//examples
+      osx_image: xcode11
 
 
 install:
diff --git a/include/boost/math/differentiation/autodiff_eigen.hpp b/include/boost/math/differentiation/autodiff_eigen.hpp
deleted file mode 100644
index 1c7c44f977..0000000000
--- a/include/boost/math/differentiation/autodiff_eigen.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef BOOST_MATH_DIFFERENTIATION_AUTODIFF_EIGEN_HPP
-#define BOOST_MATH_DIFFERENTIATION_AUTODIFF_EIGEN_HPP
-
-#include <Eigen/Core>
-#include <boost/math/differentiation/autodiff.hpp>
-
-namespace Eigen {
-template <typename RealType, size_t Order>
-struct NumTraits<boost::math::differentiation::autodiff_v1::detail::
-                     template fvar<RealType, Order>> : NumTraits<RealType> {
-  using fvar =
-      boost::math::differentiation::autodiff_v1::detail::template fvar<RealType,
-                                                                       Order>;
-
-  enum {
-    RequireInitialization = 1,
-    ReadCost = 1,
-    AddCost = 16,
-    MulCost = 16,
-  };
-};
-
-template <typename RealType, size_t Order, typename BinaryOp, typename A>
-struct ScalarBinaryOpTraits<boost::math::differentiation::autodiff_v1::detail::
-                                template fvar<RealType, Order>,
-                            A, BinaryOp> {
-  typedef boost::math::differentiation::autodiff_v1::detail::template fvar<
-      RealType, Order>
-      ReturnType;
-};
-
-template <typename RealType, size_t Order, typename BinaryOp, typename A>
-struct ScalarBinaryOpTraits<A,
-                            boost::math::differentiation::autodiff_v1::detail::
-                                template fvar<RealType, Order>,
-                            BinaryOp> {
-  typedef boost::math::differentiation::autodiff_v1::detail::template fvar<
-      RealType, Order>
-      ReturnType;
-};
-
-template <typename RealType, size_t Order, typename RealType2, size_t Order2,
-          typename BinaryOp>
-struct ScalarBinaryOpTraits<
-    boost::math::differentiation::autodiff_v1::detail::template fvar<RealType,
-                                                                     Order>,
-    boost::math::differentiation::autodiff_v1::detail::template fvar<RealType2,
-                                                                     Order2>,
-    BinaryOp> {
-  typedef ScalarBinaryOpTraits<RealType, RealType2, BinaryOp>::ReturnType
-      RealReturn;
-  const size_t ReturnOrder = (Order > Order2) ? Order : Order2;
-  typedef boost::math::differentiation::autodiff_v1::detail::template fvar<
-      RealReturn, ReturnOrder>
-      ReturnType;
-}
-}  // namespace Eigen
-
-#endif  // BOOST_MATH_DIFFERENTIATION_AUTODIFF_EIGEN_HPP