diff --git a/src/common/utilities.hh b/src/common/utilities.hh
index 174af67..d6e7859 100644
--- a/src/common/utilities.hh
+++ b/src/common/utilities.hh
@@ -1,200 +1,198 @@
 /**
  * file   utilities.hh
  *
  * @author Till Junge <till.junge@epfl.ch>
  *
  * @date   17 Nov 2017
  *
  * @brief  additions to the standard name space to anticipate C++17 features
  *
  * @section LICENCE
  *
  * Copyright © 2017 Till Junge
  *
  * µSpectre is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3, or (at
  * your option) any later version.
  *
  * µSpectre is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with GNU Emacs; see the file COPYING. If not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 
 #ifndef UTILITIES_H
 #define UTILITIES_H
 
 #include <boost/tuple/tuple.hpp>
 
 #include <tuple>
 
 #ifdef NO_EXPERIMENTAL
 #  if defined(__INTEL_COMPILER)
 //#    pragma warning ( disable : 383 )
 #  elif defined (__clang__) // test clang to be sure that when we test for gnu it is only gnu
 #    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "Weffc++"
+#    pragma clang diagnostic ignored "-Weffc++"
 #  elif (defined(__GNUC__) || defined(__GNUG__))
 #    pragma GCC diagnostic push
 #    pragma GCC diagnostic ignored "-Weffc++"
 #  endif
 #  include <boost/optional.hpp>
 #  if defined(__INTEL_COMPILER)
 //#    pragma warning ( disable : 383 )
 #  elif defined (__clang__) // test clang to be sure that when we test for gnu it is only gnu
 #    pragma clang diagnostic pop
-#    pragma clang diagnostic ignored "Weffc++"
+#    pragma clang diagnostic ignored "-Weffc++"
 #  elif (defined(__GNUC__) || defined(__GNUG__))
 #    pragma GCC diagnostic pop
 #    pragma GCC diagnostic ignored "-Weffc++"
 #  endif
 #else
 #  include <experimental/optional>
 #endif
 
 namespace std_replacement {
 
   namespace detail {
     template <class T>
     struct is_reference_wrapper : std::false_type {};
     template <class U>
     struct is_reference_wrapper<std::reference_wrapper<U>> : std::true_type {};
-    template <class T>
-    constexpr bool is_reference_wrapper_v = is_reference_wrapper<T>::value;
 
     template <class Base, class T, class Derived, class... Args>
     auto INVOKE(T Base::*pmf, Derived&& ref, Args&&... args)
       noexcept(noexcept((std::forward<Derived>(ref).*pmf)(std::forward<Args>(args)...)))
       -> std::enable_if_t<std::is_function<T>::value &&
                           std::is_base_of<Base, std::decay_t<Derived>>::value,
                           decltype((std::forward<Derived>(ref).*pmf)(std::forward<Args>(args)...))>
     {
       return (std::forward<Derived>(ref).*pmf)(std::forward<Args>(args)...);
     }
 
     template <class Base, class T, class RefWrap, class... Args>
     auto INVOKE(T Base::*pmf, RefWrap&& ref, Args&&... args)
       noexcept(noexcept((ref.get().*pmf)(std::forward<Args>(args)...)))
       -> std::enable_if_t<std::is_function<T>::value &&
-                          is_reference_wrapper_v<std::decay_t<RefWrap>>,
+                          is_reference_wrapper<std::decay_t<RefWrap>>::value,
                           decltype((ref.get().*pmf)(std::forward<Args>(args)...))>
 
     {
       return (ref.get().*pmf)(std::forward<Args>(args)...);
     }
 
     template <class Base, class T, class Pointer, class... Args>
     auto INVOKE(T Base::*pmf, Pointer&& ptr, Args&&... args)
       noexcept(noexcept(((*std::forward<Pointer>(ptr)).*pmf)(std::forward<Args>(args)...)))
       -> std::enable_if_t<std::is_function<T>::value &&
-                          !is_reference_wrapper_v<std::decay_t<Pointer>> &&
+                          !is_reference_wrapper<std::decay_t<Pointer>>::value &&
                           !std::is_base_of<Base, std::decay_t<Pointer>>::value,
                           decltype(((*std::forward<Pointer>(ptr)).*pmf)(std::forward<Args>(args)...))>
     {
       return ((*std::forward<Pointer>(ptr)).*pmf)(std::forward<Args>(args)...);
     }
 
     template <class Base, class T, class Derived>
     auto INVOKE(T Base::*pmd, Derived&& ref)
       noexcept(noexcept(std::forward<Derived>(ref).*pmd))
       -> std::enable_if_t<!std::is_function<T>::value &&
                           std::is_base_of<Base, std::decay_t<Derived>>::value,
                           decltype(std::forward<Derived>(ref).*pmd)>
     {
       return std::forward<Derived>(ref).*pmd;
     }
 
     template <class Base, class T, class RefWrap>
     auto INVOKE(T Base::*pmd, RefWrap&& ref)
       noexcept(noexcept(ref.get().*pmd))
       -> std::enable_if_t<!std::is_function<T>::value &&
-                          is_reference_wrapper_v<std::decay_t<RefWrap>>,
+                          is_reference_wrapper<std::decay_t<RefWrap>>::value,
                           decltype(ref.get().*pmd)>
     {
       return ref.get().*pmd;
     }
 
     template <class Base, class T, class Pointer>
     auto INVOKE(T Base::*pmd, Pointer&& ptr)
       noexcept(noexcept((*std::forward<Pointer>(ptr)).*pmd))
       -> std::enable_if_t<!std::is_function<T>::value &&
-                          !is_reference_wrapper_v<std::decay_t<Pointer>> &&
+                          !is_reference_wrapper<std::decay_t<Pointer>>::value &&
                           !std::is_base_of<Base, std::decay_t<Pointer>>::value,
                           decltype((*std::forward<Pointer>(ptr)).*pmd)>
     {
       return (*std::forward<Pointer>(ptr)).*pmd;
     }
 
     template <class F, class... Args>
     auto INVOKE(F&& f, Args&&... args)
       noexcept(noexcept(std::forward<F>(f)(std::forward<Args>(args)...)))
       -> std::enable_if_t<!std::is_member_pointer<std::decay_t<F>>::value,
                           decltype(std::forward<F>(f)(std::forward<Args>(args)...))>
     {
       return std::forward<F>(f)(std::forward<Args>(args)...);
     }
   } // namespace detail
 
   template< class F, class... ArgTypes >
   auto invoke(F&& f, ArgTypes&&... args)
   // exception specification for QoI
     noexcept(noexcept(detail::INVOKE(std::forward<F>(f), std::forward<ArgTypes>(args)...)))
     -> decltype(detail::INVOKE(std::forward<F>(f), std::forward<ArgTypes>(args)...))
   {
     return detail::INVOKE(std::forward<F>(f), std::forward<ArgTypes>(args)...);
   }
 
   namespace detail {
     template <class F, class Tuple, std::size_t... I>
     constexpr decltype(auto) apply_impl(F &&f, Tuple &&t, std::index_sequence<I...>)
     {
       return std_replacement::invoke(std::forward<F>(f), std::get<I>(std::forward<Tuple>(t))...);
     }
   }  // namespace detail
 
   template <class F, class Tuple>
   constexpr decltype(auto) apply(F &&f, Tuple &&t)
   {
     return detail::apply_impl
       (std::forward<F>(f), std::forward<Tuple>(t),
        std::make_index_sequence<std::tuple_size<std::decay_t<Tuple>>::value>{});
   }
 
 
 } //namespace std_replacement
 
 
 namespace muSpectre {
 
   using std_replacement::apply;
 
   template <class T>
 #ifdef NO_EXPERIMENTAL
   using optional = typename boost::optional<T>;
 #else
   using optional = typename std::experimental::optional<T>;
 #endif
 
   /* ---------------------------------------------------------------------- */
   template <typename BoostTuple, std::size_t... Is>
   auto asStdTuple(BoostTuple&& boostTuple, std::index_sequence<Is...>) {
     return std::tuple<typename boost::tuples::element<Is, std::decay_t<BoostTuple>>::type...>
       (boost::get<Is>(std::forward<BoostTuple>(boostTuple))...);
   }
   template <typename BoostTuple>
   auto asStdTuple(BoostTuple&& boostTuple) {
     return asStdTuple(std::forward<BoostTuple>(boostTuple),
                       std::make_index_sequence<boost::tuples::length<std::decay_t<BoostTuple>>::value>());
   }
 
 
 }  // muSpectre
 
 #endif /* UTILITIES_H */
diff --git a/tests/tests.hh b/tests/tests.hh
index 0666ccd..ddaaf82 100644
--- a/tests/tests.hh
+++ b/tests/tests.hh
@@ -1,63 +1,63 @@
 /**
  * file   tests.hh
  *
  * @author Till Junge <till.junge@epfl.ch>
  *
  * @date   10 May 2017
  *
  * @brief  common defs for tests
  *
  * @section LICENCE
  *
  * Copyright © 2017 Till Junge
  *
  * µSpectre is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3, or (at
  * your option) any later version.
  *
  * µSpectre is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with GNU Emacs; see the file COPYING. If not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 #include "common/common.hh"
 #  if defined(__INTEL_COMPILER)
 //#    pragma warning ( disable : 383 )
 #  elif defined (__clang__) // test clang to be sure that when we test for gnu it is only gnu
 #    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "Weffc++"
+#    pragma clang diagnostic ignored "-Weffc++"
 #  elif (defined(__GNUC__) || defined(__GNUG__))
 #    pragma GCC diagnostic push
 #    pragma GCC diagnostic ignored "-Weffc++"
 #  endif
 #include <boost/test/unit_test.hpp>
 #include <boost/mpl/list.hpp>
 #  if defined(__INTEL_COMPILER)
 //#    pragma warning ( disable : 383 )
 #  elif defined (__clang__) // test clang to be sure that when we test for gnu it is only gnu
 #    pragma clang diagnostic pop
-#    pragma clang diagnostic ignored "Weffc++"
+#    pragma clang diagnostic ignored "-Weffc++"
 #  elif (defined(__GNUC__) || defined(__GNUG__))
 #    pragma GCC diagnostic pop
 #    pragma GCC diagnostic ignored "-Weffc++"
 #  endif
 
 #ifndef TESTS_H
 #define TESTS_H
 
 namespace muSpectre {
 
 
   const Real tol = 1e-14*100; //it's in percent
 
 }  // muSpectre
 
 
 #endif /* TESTS_H */