diff --git a/test/numerics/complex.number/cases.h b/test/numerics/complex.number/cases.h
index 351c3e57..0e31c716 100644
--- a/test/numerics/complex.number/cases.h
+++ b/test/numerics/complex.number/cases.h
@@ -227,4 +227,4 @@ void is_about(long double x, long double y)
     assert(std::abs((x-y)/(x+y)) < 1.e-14);
 }
 
-#endif
+#endif  // CASES_H
diff --git a/test/numerics/complex.number/ccmplx/ccomplex.pass.cpp b/test/numerics/complex.number/ccmplx/ccomplex.pass.cpp
index aa6a7b13..c06c4e7f 100644
--- a/test/numerics/complex.number/ccmplx/ccomplex.pass.cpp
+++ b/test/numerics/complex.number/ccmplx/ccomplex.pass.cpp
@@ -9,7 +9,6 @@
 
 // <ccomplex>
 
-
 #include <ccomplex>
 
 #ifndef _LIBCPP_VERSION
diff --git a/test/numerics/complex.number/cmplx.over/arg.pass.cpp b/test/numerics/complex.number/cmplx.over/arg.pass.cpp
index a92d6653..72a04d64 100644
--- a/test/numerics/complex.number/cmplx.over/arg.pass.cpp
+++ b/test/numerics/complex.number/cmplx.over/arg.pass.cpp
@@ -44,7 +44,6 @@ test()
     test<T>(10);
 }
 
-
 int main()
 {
     test<float>();
diff --git a/test/numerics/complex.number/cmplx.over/conj.pass.cpp b/test/numerics/complex.number/cmplx.over/conj.pass.cpp
index 84bacdb3..bf351adc 100644
--- a/test/numerics/complex.number/cmplx.over/conj.pass.cpp
+++ b/test/numerics/complex.number/cmplx.over/conj.pass.cpp
@@ -55,7 +55,6 @@ test()
     test<T>(10);
 }
 
-
 int main()
 {
     test<float>();
diff --git a/test/numerics/complex.number/cmplx.over/imag.pass.cpp b/test/numerics/complex.number/cmplx.over/imag.pass.cpp
index 902ea75b..fe0e4ff7 100644
--- a/test/numerics/complex.number/cmplx.over/imag.pass.cpp
+++ b/test/numerics/complex.number/cmplx.over/imag.pass.cpp
@@ -44,7 +44,6 @@ test()
     test<T>(10);
 }
 
-
 int main()
 {
     test<float>();
diff --git a/test/numerics/complex.number/cmplx.over/norm.pass.cpp b/test/numerics/complex.number/cmplx.over/norm.pass.cpp
index d25457af..5b8a6510 100644
--- a/test/numerics/complex.number/cmplx.over/norm.pass.cpp
+++ b/test/numerics/complex.number/cmplx.over/norm.pass.cpp
@@ -44,7 +44,6 @@ test()
     test<T>(10);
 }
 
-
 int main()
 {
     test<float>();
diff --git a/test/numerics/complex.number/cmplx.over/pow.pass.cpp b/test/numerics/complex.number/cmplx.over/pow.pass.cpp
index 7cd5e407..5e37e306 100644
--- a/test/numerics/complex.number/cmplx.over/pow.pass.cpp
+++ b/test/numerics/complex.number/cmplx.over/pow.pass.cpp
@@ -79,7 +79,6 @@ test(typename std::enable_if<!std::is_integral<T>::value>::type* = 0, typename s
     test(std::complex<T>(3, 4), std::complex<U>(5, 6));
 }
 
-
 int main()
 {
     test<int, float>();
diff --git a/test/numerics/complex.number/cmplx.over/proj.pass.cpp b/test/numerics/complex.number/cmplx.over/proj.pass.cpp
index a7290d4f..315f9357 100644
--- a/test/numerics/complex.number/cmplx.over/proj.pass.cpp
+++ b/test/numerics/complex.number/cmplx.over/proj.pass.cpp
@@ -55,7 +55,6 @@ test()
     test<T>(10);
 }
 
-
 int main()
 {
     test<float>();
diff --git a/test/numerics/complex.number/cmplx.over/real.pass.cpp b/test/numerics/complex.number/cmplx.over/real.pass.cpp
index db4a8c77..4754564e 100644
--- a/test/numerics/complex.number/cmplx.over/real.pass.cpp
+++ b/test/numerics/complex.number/cmplx.over/real.pass.cpp
@@ -44,7 +44,6 @@ test()
     test<T>(10);
 }
 
-
 int main()
 {
     test<float>();
diff --git a/test/numerics/complex.number/complex.member.ops/assignment_complex.pass.cpp b/test/numerics/complex.number/complex.member.ops/assignment_complex.pass.cpp
index 42685365..36a69e55 100644
--- a/test/numerics/complex.number/complex.member.ops/assignment_complex.pass.cpp
+++ b/test/numerics/complex.number/complex.member.ops/assignment_complex.pass.cpp
@@ -9,7 +9,7 @@
 
 // <complex>
 
-// complex& operator=(const complex&); 
+// complex& operator=(const complex&);
 // template<class X> complex& operator= (const complex<X>&);
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.ops/complex_divide_complex.pass.cpp b/test/numerics/complex.number/complex.ops/complex_divide_complex.pass.cpp
index 06e6798e..f3e3c3e9 100644
--- a/test/numerics/complex.number/complex.ops/complex_divide_complex.pass.cpp
+++ b/test/numerics/complex.number/complex.ops/complex_divide_complex.pass.cpp
@@ -9,7 +9,7 @@
 
 // <complex>
 
-// template<class T> 
+// template<class T>
 //   complex<T>
 //   operator/(const complex<T>& lhs, const complex<T>& rhs);
 
diff --git a/test/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp b/test/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp
index c6fb1b82..b3bb613f 100644
--- a/test/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp
+++ b/test/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp
@@ -9,7 +9,7 @@
 
 // <complex>
 
-// template<class T> 
+// template<class T>
 //   bool
 //   operator==(const complex<T>& lhs, const complex<T>& rhs);
 
diff --git a/test/numerics/complex.number/complex.ops/complex_minus_complex.pass.cpp b/test/numerics/complex.number/complex.ops/complex_minus_complex.pass.cpp
index b565c82f..6ed9f3ae 100644
--- a/test/numerics/complex.number/complex.ops/complex_minus_complex.pass.cpp
+++ b/test/numerics/complex.number/complex.ops/complex_minus_complex.pass.cpp
@@ -9,7 +9,7 @@
 
 // <complex>
 
-// template<class T> 
+// template<class T>
 //   complex<T>
 //   operator-(const complex<T>& lhs, const complex<T>& rhs);
 
diff --git a/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp b/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp
index dee18328..d5d0384c 100644
--- a/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp
+++ b/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp
@@ -9,7 +9,7 @@
 
 // <complex>
 
-// template<class T> 
+// template<class T>
 //   bool
 //   operator!=(const complex<T>& lhs, const complex<T>& rhs);
 
diff --git a/test/numerics/complex.number/complex.ops/complex_plus_complex.pass.cpp b/test/numerics/complex.number/complex.ops/complex_plus_complex.pass.cpp
index fc98e72c..46b02144 100644
--- a/test/numerics/complex.number/complex.ops/complex_plus_complex.pass.cpp
+++ b/test/numerics/complex.number/complex.ops/complex_plus_complex.pass.cpp
@@ -9,7 +9,7 @@
 
 // <complex>
 
-// template<class T> 
+// template<class T>
 //   complex<T>
 //   operator+(const complex<T>& lhs, const complex<T>& rhs);
 
diff --git a/test/numerics/complex.number/complex.ops/complex_times_complex.pass.cpp b/test/numerics/complex.number/complex.ops/complex_times_complex.pass.cpp
index 34d2e5f7..9e0f7af7 100644
--- a/test/numerics/complex.number/complex.ops/complex_times_complex.pass.cpp
+++ b/test/numerics/complex.number/complex.ops/complex_times_complex.pass.cpp
@@ -9,7 +9,7 @@
 
 // <complex>
 
-// template<class T> 
+// template<class T>
 //   complex<T>
 //   operator*(const complex<T>& lhs, const complex<T>& rhs);
 
diff --git a/test/numerics/complex.number/complex.ops/stream_input.pass.cpp b/test/numerics/complex.number/complex.ops/stream_input.pass.cpp
index ab2128d6..780431e4 100644
--- a/test/numerics/complex.number/complex.ops/stream_input.pass.cpp
+++ b/test/numerics/complex.number/complex.ops/stream_input.pass.cpp
@@ -9,8 +9,8 @@
 
 // <complex>
 
-// template<class T, class charT, class traits> 
-//   basic_istream<charT, traits>& 
+// template<class T, class charT, class traits>
+//   basic_istream<charT, traits>&
 //   operator>>(basic_istream<charT, traits>& is, complex<T>& x);
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.ops/stream_output.pass.cpp b/test/numerics/complex.number/complex.ops/stream_output.pass.cpp
index 00613793..046749ed 100644
--- a/test/numerics/complex.number/complex.ops/stream_output.pass.cpp
+++ b/test/numerics/complex.number/complex.ops/stream_output.pass.cpp
@@ -9,8 +9,8 @@
 
 // <complex>
 
-// template<class T, class charT, class traits> 
-//   basic_ostream<charT, traits>& 
+// template<class T, class charT, class traits>
+//   basic_ostream<charT, traits>&
 //   operator<<(basic_ostream<charT, traits>& o, const complex<T>& x);
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp b/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp
index 800871db..b6e14970 100644
--- a/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<double>
-// { 
-// public: 
-//     constexpr complex(const complex<float>&); 
+// {
+// public:
+//     constexpr complex(const complex<float>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp b/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp
index 43bccb6d..4dd0f193 100644
--- a/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<double>
-// { 
-// public: 
-//     constexpr complex(const complex<float>&); 
+// {
+// public:
+//     constexpr complex(const complex<float>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp b/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp
index 7b4d0b31..495bc6b7 100644
--- a/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<double>
-// { 
-// public: 
-//     explicit constexpr complex(const complex<long double>&); 
+// {
+// public:
+//     explicit constexpr complex(const complex<long double>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/double_long_double_implicit.fail.cpp b/test/numerics/complex.number/complex.special/double_long_double_implicit.fail.cpp
index 48d330e1..a2e6f73f 100644
--- a/test/numerics/complex.number/complex.special/double_long_double_implicit.fail.cpp
+++ b/test/numerics/complex.number/complex.special/double_long_double_implicit.fail.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<double>
-// { 
-// public: 
-//     explicit constexpr complex(const complex<long double>&); 
+// {
+// public:
+//     explicit constexpr complex(const complex<long double>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp b/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp
index bc016c93..5d2154b8 100644
--- a/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<float>
-// { 
-// public: 
-//     explicit constexpr complex(const complex<double>&); 
+// {
+// public:
+//     explicit constexpr complex(const complex<double>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/float_double_implicit.fail.cpp b/test/numerics/complex.number/complex.special/float_double_implicit.fail.cpp
index dc9ab9e0..c5e3bd0a 100644
--- a/test/numerics/complex.number/complex.special/float_double_implicit.fail.cpp
+++ b/test/numerics/complex.number/complex.special/float_double_implicit.fail.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<float>
-// { 
-// public: 
-//     explicit constexpr complex(const complex<double>&); 
+// {
+// public:
+//     explicit constexpr complex(const complex<double>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp b/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp
index 7ad0828d..43c3fc8e 100644
--- a/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<float>
-// { 
-// public: 
-//     explicit constexpr complex(const complex<long double>&); 
+// {
+// public:
+//     explicit constexpr complex(const complex<long double>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/float_long_double_implicit.fail.cpp b/test/numerics/complex.number/complex.special/float_long_double_implicit.fail.cpp
index 1f87f46d..96339bca 100644
--- a/test/numerics/complex.number/complex.special/float_long_double_implicit.fail.cpp
+++ b/test/numerics/complex.number/complex.special/float_long_double_implicit.fail.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<float>
-// { 
-// public: 
-//     explicit constexpr complex(const complex<long double>&); 
+// {
+// public:
+//     explicit constexpr complex(const complex<long double>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp b/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp
index ad88b311..9f3d7202 100644
--- a/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<long double>
-// { 
-// public: 
-//     constexpr complex(const complex<double>&); 
+// {
+// public:
+//     constexpr complex(const complex<double>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp b/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp
index e8cbf5dd..bb690a9b 100644
--- a/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<long double>
-// { 
-// public: 
-//     constexpr complex(const complex<double>&); 
+// {
+// public:
+//     constexpr complex(const complex<double>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp b/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp
index 6041ad16..126b6e0a 100644
--- a/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<long double>
-// { 
-// public: 
-//     constexpr complex(const complex<float>&); 
+// {
+// public:
+//     constexpr complex(const complex<float>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp b/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp
index eff60e77..ae7fccf0 100644
--- a/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp
+++ b/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp
@@ -10,9 +10,9 @@
 // <complex>
 
 // template<> class complex<long double>
-// { 
-// public: 
-//     constexpr complex(const complex<float>&); 
+// {
+// public:
+//     constexpr complex(const complex<float>&);
 // };
 
 #include <complex>
diff --git a/test/numerics/complex.number/complex.transcendentals/pow_complex_complex.pass.cpp b/test/numerics/complex.number/complex.transcendentals/pow_complex_complex.pass.cpp
index 003869f5..a4faf206 100644
--- a/test/numerics/complex.number/complex.transcendentals/pow_complex_complex.pass.cpp
+++ b/test/numerics/complex.number/complex.transcendentals/pow_complex_complex.pass.cpp
@@ -9,7 +9,7 @@
 
 // <complex>
 
-// template<class T> 
+// template<class T>
 //   complex<T>
 //   pow(const complex<T>& x, const complex<T>& y);
 
diff --git a/test/numerics/complex.number/complex.value.ops/abs.pass.cpp b/test/numerics/complex.number/complex.value.ops/abs.pass.cpp
index 16c3b4da..dbc406d1 100644
--- a/test/numerics/complex.number/complex.value.ops/abs.pass.cpp
+++ b/test/numerics/complex.number/complex.value.ops/abs.pass.cpp
@@ -54,7 +54,6 @@ void test_edges()
     }
 }
 
-
 int main()
 {
     test<float>();
diff --git a/test/numerics/complex.number/complex.value.ops/arg.pass.cpp b/test/numerics/complex.number/complex.value.ops/arg.pass.cpp
index 7844400e..f0092b0e 100644
--- a/test/numerics/complex.number/complex.value.ops/arg.pass.cpp
+++ b/test/numerics/complex.number/complex.value.ops/arg.pass.cpp
@@ -126,7 +126,6 @@ void test_edges()
     }
 }
 
-
 int main()
 {
     test<float>();
diff --git a/test/numerics/complex.number/complex/types.pass.cpp b/test/numerics/complex.number/complex/types.pass.cpp
index 2d4b1363..26bc4368 100644
--- a/test/numerics/complex.number/complex/types.pass.cpp
+++ b/test/numerics/complex.number/complex/types.pass.cpp
@@ -9,11 +9,11 @@
 
 // <complex>
 
-// template<class T> 
+// template<class T>
 // class complex
-// { 
-// public: 
-//   typedef T value_type; 
+// {
+// public:
+//   typedef T value_type;
 //   ...
 // };
 
diff --git a/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp b/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp
index b9fd1d02..26890f5a 100644
--- a/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp
+++ b/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp
@@ -53,5 +53,5 @@ int main()
                 assert(v2[i][j] == a[i][j]);
         }
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp b/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp
index b3ffe5f3..4999023a 100644
--- a/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp
+++ b/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp
@@ -59,5 +59,5 @@ int main()
                 assert(v2[i][j] == a[i][j]);
         }
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp b/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp
index a91654d5..4457ea1e 100644
--- a/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp
+++ b/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp
@@ -37,5 +37,5 @@ int main()
         for (int i = 0; i < N; ++i)
             assert(v[i] == a[i]);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp b/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp
index c6ceb2b1..ea115c3e 100644
--- a/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp
+++ b/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp
@@ -57,5 +57,5 @@ int main()
                 assert(v2[i][j] == a[i][j]);
         }
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp b/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp
index 7be2310d..9901cb94 100644
--- a/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp
+++ b/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp
@@ -9,9 +9,9 @@
 
 // <numeric>
 
-// template <InputIterator Iter, MoveConstructible T> 
-//   requires HasPlus<T, Iter::reference> 
-//         && HasAssign<T, HasPlus<T, Iter::reference>::result_type> 
+// template <InputIterator Iter, MoveConstructible T>
+//   requires HasPlus<T, Iter::reference>
+//         && HasAssign<T, HasPlus<T, Iter::reference>::result_type>
 //   T
 //   accumulate(Iter first, Iter last, T init);
 
diff --git a/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp b/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
index ad6c854d..69fddda7 100644
--- a/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
+++ b/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
@@ -10,9 +10,9 @@
 // <numeric>
 
 // template <InputIterator Iter, MoveConstructible T,
-//           Callable<auto, const T&, Iter::reference> BinaryOperation> 
-//   requires HasAssign<T, BinaryOperation::result_type> 
-//         && CopyConstructible<BinaryOperation> 
+//           Callable<auto, const T&, Iter::reference> BinaryOperation>
+//   requires HasAssign<T, BinaryOperation::result_type>
+//         && CopyConstructible<BinaryOperation>
 //   T
 //   accumulate(Iter first, Iter last, T init, BinaryOperation binary_op);
 
diff --git a/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp b/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
index 22a19deb..5e0872a9 100644
--- a/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
+++ b/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
@@ -10,12 +10,12 @@
 // <numeric>
 
 // template <InputIterator InIter,
-//           OutputIterator<auto, const InIter::value_type&> OutIter> 
-//   requires HasMinus<InIter::value_type, InIter::value_type> 
-//         && Constructible<InIter::value_type, InIter::reference> 
+//           OutputIterator<auto, const InIter::value_type&> OutIter>
+//   requires HasMinus<InIter::value_type, InIter::value_type>
+//         && Constructible<InIter::value_type, InIter::reference>
 //         && OutputIterator<OutIter,
-//                           HasMinus<InIter::value_type, InIter::value_type>::result_type> 
-//         && MoveAssignable<InIter::value_type> 
+//                           HasMinus<InIter::value_type, InIter::value_type>::result_type>
+//         && MoveAssignable<InIter::value_type>
 //   OutIter
 //   adjacent_difference(InIter first, InIter last, OutIter result);
 
diff --git a/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp b/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
index 541afcf5..4db79817 100644
--- a/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
+++ b/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
@@ -10,12 +10,12 @@
 // <numeric>
 
 // template <InputIterator InIter,
-//           OutputIterator<auto, const InIter::value_type&> OutIter, 
-//           Callable<auto, const InIter::value_type&, const InIter::value_type&> BinaryOperation> 
-//   requires Constructible<InIter::value_type, InIter::reference> 
-//         && OutputIterator<OutIter, BinaryOperation::result_type> 
-//         && MoveAssignable<InIter::value_type> 
-//         && CopyConstructible<BinaryOperation> 
+//           OutputIterator<auto, const InIter::value_type&> OutIter,
+//           Callable<auto, const InIter::value_type&, const InIter::value_type&> BinaryOperation>
+//   requires Constructible<InIter::value_type, InIter::reference>
+//         && OutputIterator<OutIter, BinaryOperation::result_type>
+//         && MoveAssignable<InIter::value_type>
+//         && CopyConstructible<BinaryOperation>
 //   OutIter
 //   adjacent_difference(InIter first, InIter last, OutIter result, BinaryOperation binary_op);
 
diff --git a/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp b/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp
index 8740280d..3f96cdf2 100644
--- a/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp
+++ b/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp
@@ -9,9 +9,9 @@
 
 // <numeric>
 
-// template <InputIterator Iter1, InputIterator Iter2, MoveConstructible T> 
-//   requires HasMultiply<Iter1::reference, Iter2::reference> 
-//         && HasPlus<T, HasMultiply<Iter1::reference, Iter2::reference>::result_type> 
+// template <InputIterator Iter1, InputIterator Iter2, MoveConstructible T>
+//   requires HasMultiply<Iter1::reference, Iter2::reference>
+//         && HasPlus<T, HasMultiply<Iter1::reference, Iter2::reference>::result_type>
 //         && HasAssign<T,
 //                      HasPlus<T,
 //                              HasMultiply<Iter1::reference,
diff --git a/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp b/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
index 5b0dc059..0c6e58b7 100644
--- a/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
+++ b/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
@@ -9,13 +9,13 @@
 
 // <numeric>
 
-// template <InputIterator Iter1, InputIterator Iter2, MoveConstructible T, 
+// template <InputIterator Iter1, InputIterator Iter2, MoveConstructible T,
 //           class BinaryOperation1,
-//           Callable<auto, Iter1::reference, Iter2::reference> BinaryOperation2> 
-//   requires Callable<BinaryOperation1, const T&, BinaryOperation2::result_type> 
-//         && HasAssign<T, BinaryOperation1::result_type> 
-//         && CopyConstructible<BinaryOperation1> 
-//         && CopyConstructible<BinaryOperation2> 
+//           Callable<auto, Iter1::reference, Iter2::reference> BinaryOperation2>
+//   requires Callable<BinaryOperation1, const T&, BinaryOperation2::result_type>
+//         && HasAssign<T, BinaryOperation1::result_type>
+//         && CopyConstructible<BinaryOperation1>
+//         && CopyConstructible<BinaryOperation2>
 //   T
 //   inner_product(Iter1 first1, Iter1 last1, Iter2 first2,
 //                 T init, BinaryOperation1 binary_op1, BinaryOperation2 binary_op2);
diff --git a/test/numerics/numeric.ops/iterators.h b/test/numerics/numeric.ops/iterators.h
index 01b0e336..539a9a49 100644
--- a/test/numerics/numeric.ops/iterators.h
+++ b/test/numerics/numeric.ops/iterators.h
@@ -311,4 +311,4 @@ base(Iter i)
     return i;
 }
 
-#endif
+#endif  // ITERATORS_H
diff --git a/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp b/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
index dcebf8eb..6b5a689e 100644
--- a/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
+++ b/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
@@ -9,11 +9,11 @@
 
 // <numeric>
 
-// template <InputIterator InIter, OutputIterator<auto, const InIter::value_type&> OutIter> 
-//   requires HasPlus<InIter::value_type, InIter::reference> 
+// template <InputIterator InIter, OutputIterator<auto, const InIter::value_type&> OutIter>
+//   requires HasPlus<InIter::value_type, InIter::reference>
 //         && HasAssign<InIter::value_type,
-//                      HasPlus<InIter::value_type, InIter::reference>::result_type> 
-//         && Constructible<InIter::value_type, InIter::reference> 
+//                      HasPlus<InIter::value_type, InIter::reference>::result_type>
+//         && Constructible<InIter::value_type, InIter::reference>
 //   OutIter
 //   partial_sum(InIter first, InIter last, OutIter result);
 
diff --git a/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp b/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
index 1e994679..866027c6 100644
--- a/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
+++ b/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
@@ -10,11 +10,11 @@
 // <numeric>
 
 // template<InputIterator InIter,
-//          OutputIterator<auto, const InIter::value_type&> OutIter, 
-//          Callable<auto, const InIter::value_type&, InIter::reference> BinaryOperation> 
-//   requires HasAssign<InIter::value_type, BinaryOperation::result_type> 
-//         && Constructible<InIter::value_type, InIter::reference> 
-//         && CopyConstructible<BinaryOperation> 
+//          OutputIterator<auto, const InIter::value_type&> OutIter,
+//          Callable<auto, const InIter::value_type&, InIter::reference> BinaryOperation>
+//   requires HasAssign<InIter::value_type, BinaryOperation::result_type>
+//         && Constructible<InIter::value_type, InIter::reference>
+//         && CopyConstructible<BinaryOperation>
 //   OutIter
 //   partial_sum(InIter first, InIter last, OutIter result, BinaryOperation binary_op);
 
diff --git a/test/numerics/rand/rand.adapt/rand.adapt.disc/io.pass.cpp b/test/numerics/rand/rand.adapt/rand.adapt.disc/io.pass.cpp
index 16e9af72..ef6b1eb5 100644
--- a/test/numerics/rand/rand.adapt/rand.adapt.disc/io.pass.cpp
+++ b/test/numerics/rand/rand.adapt/rand.adapt.disc/io.pass.cpp
@@ -17,7 +17,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const discard_block_engine<Engine, p, r>& x);
-// 
+//
 // template <class charT, class traits,
 //           class Engine, size_t p, size_t r>
 // basic_istream<charT, traits>&
diff --git a/test/numerics/rand/rand.adapt/rand.adapt.disc/values.pass.cpp b/test/numerics/rand/rand.adapt/rand.adapt.disc/values.pass.cpp
index 3a5f573f..c26c71ca 100644
--- a/test/numerics/rand/rand.adapt/rand.adapt.disc/values.pass.cpp
+++ b/test/numerics/rand/rand.adapt/rand.adapt.disc/values.pass.cpp
@@ -15,7 +15,7 @@
 // public:
 //     // types
 //     typedef typename Engine::result_type result_type;
-// 
+//
 //     // engine characteristics
 //     static constexpr size_t block_size = p;
 //     static constexpr size_t used_block = r;
diff --git a/test/numerics/rand/rand.adapt/rand.adapt.ibits/io.pass.cpp b/test/numerics/rand/rand.adapt/rand.adapt.ibits/io.pass.cpp
index 6a64739d..1161e8be 100644
--- a/test/numerics/rand/rand.adapt/rand.adapt.ibits/io.pass.cpp
+++ b/test/numerics/rand/rand.adapt/rand.adapt.ibits/io.pass.cpp
@@ -17,7 +17,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const independent_bits_engine<Engine, w, UIntType>& x);
-// 
+//
 // template <class charT, class traits,
 //           class Engine, size_t w, class UIntType>
 // basic_istream<charT, traits>&
diff --git a/test/numerics/rand/rand.adapt/rand.adapt.ibits/values.pass.cpp b/test/numerics/rand/rand.adapt/rand.adapt.ibits/values.pass.cpp
index 073dc5fa..d359185f 100644
--- a/test/numerics/rand/rand.adapt/rand.adapt.ibits/values.pass.cpp
+++ b/test/numerics/rand/rand.adapt/rand.adapt.ibits/values.pass.cpp
@@ -15,7 +15,7 @@
 // public:
 //     // types
 //     typedef UIntType result_type;
-// 
+//
 //     // engine characteristics
 //     static constexpr result_type min() { return 0; }
 //     static constexpr result_type max() { return 2^w - 1; }
diff --git a/test/numerics/rand/rand.adapt/rand.adapt.shuf/io.pass.cpp b/test/numerics/rand/rand.adapt/rand.adapt.shuf/io.pass.cpp
index 6641d85d..444ee9ff 100644
--- a/test/numerics/rand/rand.adapt/rand.adapt.shuf/io.pass.cpp
+++ b/test/numerics/rand/rand.adapt/rand.adapt.shuf/io.pass.cpp
@@ -17,7 +17,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const shuffle_order_engine<Engine, k>& x);
-// 
+//
 // template <class charT, class traits,
 //           class Engine, size_t k>
 // basic_istream<charT, traits>&
diff --git a/test/numerics/rand/rand.adapt/rand.adapt.shuf/values.pass.cpp b/test/numerics/rand/rand.adapt/rand.adapt.shuf/values.pass.cpp
index 7327bad7..1668813d 100644
--- a/test/numerics/rand/rand.adapt/rand.adapt.shuf/values.pass.cpp
+++ b/test/numerics/rand/rand.adapt/rand.adapt.shuf/values.pass.cpp
@@ -15,7 +15,7 @@
 // public:
 //     // types
 //     typedef typename Engine::result_type result_type;
-// 
+//
 //     // engine characteristics
 //     static constexpr size_t table_size = k;
 //     static constexpr result_type min() { return Engine::min; }
diff --git a/test/numerics/rand/rand.device/entropy.pass.cpp b/test/numerics/rand/rand.device/entropy.pass.cpp
index 222effc4..63f6f4c0 100644
--- a/test/numerics/rand/rand.device/entropy.pass.cpp
+++ b/test/numerics/rand/rand.device/entropy.pass.cpp
@@ -16,7 +16,6 @@
 #include <random>
 #include <cassert>
 
-
 int main()
 {
     std::random_device r;
diff --git a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/io.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/io.pass.cpp
index 319f55f9..aae93813 100644
--- a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/io.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/io.pass.cpp
@@ -15,7 +15,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const bernoulli_distribution& x);
-// 
+//
 // template <class charT, class traits>
 // basic_istream<charT, traits>&
 // operator>>(basic_istream<charT, traits>& is,
diff --git a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/io.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/io.pass.cpp
index b790980e..9e333744 100644
--- a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/io.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/io.pass.cpp
@@ -16,7 +16,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const binomial_distribution& x);
-// 
+//
 // template <class charT, class traits>
 // basic_istream<charT, traits>&
 // operator>>(basic_istream<charT, traits>& is,
diff --git a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/io.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/io.pass.cpp
index 051ec0ea..5ec0d302 100644
--- a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/io.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/io.pass.cpp
@@ -16,7 +16,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const geometric_distribution& x);
-// 
+//
 // template <class charT, class traits>
 // basic_istream<charT, traits>&
 // operator>>(basic_istream<charT, traits>& is,
diff --git a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/io.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/io.pass.cpp
index ed72ff12..aa936207 100644
--- a/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/io.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/io.pass.cpp
@@ -16,7 +16,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const negative_binomial_distribution& x);
-// 
+//
 // template <class charT, class traits>
 // basic_istream<charT, traits>&
 // operator>>(basic_istream<charT, traits>& is,
diff --git a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval_param.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval_param.pass.cpp
index c4cfaef8..9a695ad4 100644
--- a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval_param.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval_param.pass.cpp
@@ -25,7 +25,6 @@ f(double x, double a, double b)
     return 1/3.1415926535897932 * std::atan((x - a)/b) + .5;
 }
 
-
 int main()
 {
     {
diff --git a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp
index 6402fed5..9bb1f6ab 100644
--- a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp
@@ -62,7 +62,7 @@ int main()
         kurtosis -= 3;
         double x_mean = std::exp(d.m() + sqr(d.s())/2);
         double x_var = (std::exp(sqr(d.s())) - 1) * std::exp(2*d.m() + sqr(d.s()));
-        double x_skew = (std::exp(sqr(d.s())) + 2) * 
+        double x_skew = (std::exp(sqr(d.s())) + 2) *
               std::sqrt((std::exp(sqr(d.s())) - 1));
         double x_kurtosis = std::exp(4*sqr(d.s())) + 2*std::exp(3*sqr(d.s())) +
                           3*std::exp(2*sqr(d.s())) - 6;
@@ -104,7 +104,7 @@ int main()
         kurtosis -= 3;
         double x_mean = std::exp(d.m() + sqr(d.s())/2);
         double x_var = (std::exp(sqr(d.s())) - 1) * std::exp(2*d.m() + sqr(d.s()));
-        double x_skew = (std::exp(sqr(d.s())) + 2) * 
+        double x_skew = (std::exp(sqr(d.s())) + 2) *
               std::sqrt((std::exp(sqr(d.s())) - 1));
         double x_kurtosis = std::exp(4*sqr(d.s())) + 2*std::exp(3*sqr(d.s())) +
                           3*std::exp(2*sqr(d.s())) - 6;
@@ -146,7 +146,7 @@ int main()
         kurtosis -= 3;
         double x_mean = std::exp(d.m() + sqr(d.s())/2);
         double x_var = (std::exp(sqr(d.s())) - 1) * std::exp(2*d.m() + sqr(d.s()));
-        double x_skew = (std::exp(sqr(d.s())) + 2) * 
+        double x_skew = (std::exp(sqr(d.s())) + 2) *
               std::sqrt((std::exp(sqr(d.s())) - 1));
         double x_kurtosis = std::exp(4*sqr(d.s())) + 2*std::exp(3*sqr(d.s())) +
                           3*std::exp(2*sqr(d.s())) - 6;
@@ -188,7 +188,7 @@ int main()
         kurtosis -= 3;
         double x_mean = std::exp(d.m() + sqr(d.s())/2);
         double x_var = (std::exp(sqr(d.s())) - 1) * std::exp(2*d.m() + sqr(d.s()));
-        double x_skew = (std::exp(sqr(d.s())) + 2) * 
+        double x_skew = (std::exp(sqr(d.s())) + 2) *
               std::sqrt((std::exp(sqr(d.s())) - 1));
         double x_kurtosis = std::exp(4*sqr(d.s())) + 2*std::exp(3*sqr(d.s())) +
                           3*std::exp(2*sqr(d.s())) - 6;
@@ -230,7 +230,7 @@ int main()
         kurtosis -= 3;
         double x_mean = std::exp(d.m() + sqr(d.s())/2);
         double x_var = (std::exp(sqr(d.s())) - 1) * std::exp(2*d.m() + sqr(d.s()));
-        double x_skew = (std::exp(sqr(d.s())) + 2) * 
+        double x_skew = (std::exp(sqr(d.s())) + 2) *
               std::sqrt((std::exp(sqr(d.s())) - 1));
         double x_kurtosis = std::exp(4*sqr(d.s())) + 2*std::exp(3*sqr(d.s())) +
                           3*std::exp(2*sqr(d.s())) - 6;
diff --git a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp
index f223d897..ffb56cfe 100644
--- a/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp
@@ -64,7 +64,7 @@ int main()
         kurtosis -= 3;
         double x_mean = std::exp(p.m() + sqr(p.s())/2);
         double x_var = (std::exp(sqr(p.s())) - 1) * std::exp(2*p.m() + sqr(p.s()));
-        double x_skew = (std::exp(sqr(p.s())) + 2) * 
+        double x_skew = (std::exp(sqr(p.s())) + 2) *
               std::sqrt((std::exp(sqr(p.s())) - 1));
         double x_kurtosis = std::exp(4*sqr(p.s())) + 2*std::exp(3*sqr(p.s())) +
                           3*std::exp(2*sqr(p.s())) - 6;
@@ -107,7 +107,7 @@ int main()
         kurtosis -= 3;
         double x_mean = std::exp(p.m() + sqr(p.s())/2);
         double x_var = (std::exp(sqr(p.s())) - 1) * std::exp(2*p.m() + sqr(p.s()));
-        double x_skew = (std::exp(sqr(p.s())) + 2) * 
+        double x_skew = (std::exp(sqr(p.s())) + 2) *
               std::sqrt((std::exp(sqr(p.s())) - 1));
         double x_kurtosis = std::exp(4*sqr(p.s())) + 2*std::exp(3*sqr(p.s())) +
                           3*std::exp(2*sqr(p.s())) - 6;
@@ -150,7 +150,7 @@ int main()
         kurtosis -= 3;
         double x_mean = std::exp(p.m() + sqr(p.s())/2);
         double x_var = (std::exp(sqr(p.s())) - 1) * std::exp(2*p.m() + sqr(p.s()));
-        double x_skew = (std::exp(sqr(p.s())) + 2) * 
+        double x_skew = (std::exp(sqr(p.s())) + 2) *
               std::sqrt((std::exp(sqr(p.s())) - 1));
         double x_kurtosis = std::exp(4*sqr(p.s())) + 2*std::exp(3*sqr(p.s())) +
                           3*std::exp(2*sqr(p.s())) - 6;
@@ -193,7 +193,7 @@ int main()
         kurtosis -= 3;
         double x_mean = std::exp(p.m() + sqr(p.s())/2);
         double x_var = (std::exp(sqr(p.s())) - 1) * std::exp(2*p.m() + sqr(p.s()));
-        double x_skew = (std::exp(sqr(p.s())) + 2) * 
+        double x_skew = (std::exp(sqr(p.s())) + 2) *
               std::sqrt((std::exp(sqr(p.s())) - 1));
         double x_kurtosis = std::exp(4*sqr(p.s())) + 2*std::exp(3*sqr(p.s())) +
                           3*std::exp(2*sqr(p.s())) - 6;
@@ -236,7 +236,7 @@ int main()
         kurtosis -= 3;
         double x_mean = std::exp(p.m() + sqr(p.s())/2);
         double x_var = (std::exp(sqr(p.s())) - 1) * std::exp(2*p.m() + sqr(p.s()));
-        double x_skew = (std::exp(sqr(p.s())) + 2) * 
+        double x_skew = (std::exp(sqr(p.s())) + 2) *
               std::sqrt((std::exp(sqr(p.s())) - 1));
         double x_kurtosis = std::exp(4*sqr(p.s())) + 2*std::exp(3*sqr(p.s())) +
                           3*std::exp(2*sqr(p.s())) - 6;
diff --git a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_init.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_init.pass.cpp
index fffb0dba..c3d4b764 100644
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_init.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_init.pass.cpp
@@ -77,5 +77,5 @@ int main()
         assert(p[1] == 0);
         assert(p[2] == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/io.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/io.pass.cpp
index c8e8a5e1..bc1d5ac5 100644
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/io.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/io.pass.cpp
@@ -16,7 +16,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const discrete_distribution& x);
-// 
+//
 // template <class charT, class traits>
 // basic_istream<charT, traits>&
 // operator>>(basic_istream<charT, traits>& is,
diff --git a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_init.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_init.pass.cpp
index bf01b0ae..60680df2 100644
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_init.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_init.pass.cpp
@@ -84,5 +84,5 @@ int main()
         assert(p[1] == 0);
         assert(p[2] == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_init_func.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_init_func.pass.cpp
index abbf5596..afaecb76 100644
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_init_func.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_init_func.pass.cpp
@@ -74,5 +74,5 @@ int main()
         assert(dn[0] == 0.203125);
         assert(dn[1] == 0.1484375);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/io.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/io.pass.cpp
index 64f0b808..efc7d36c 100644
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/io.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/io.pass.cpp
@@ -16,7 +16,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const piecewise_constant_distribution& x);
-// 
+//
 // template <class charT, class traits>
 // basic_istream<charT, traits>&
 // operator>>(basic_istream<charT, traits>& is,
diff --git a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_init_func.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_init_func.pass.cpp
index 8d278364..bea2bfd7 100644
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_init_func.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_init_func.pass.cpp
@@ -75,5 +75,5 @@ int main()
         assert(dn[0] == 0.203125);
         assert(dn[1] == 0.1484375);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_init_func.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_init_func.pass.cpp
index 77aab01e..ccf28eaa 100644
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_init_func.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_init_func.pass.cpp
@@ -78,5 +78,5 @@ int main()
         assert(dn[1] == 0.125);
         assert(dn[2] == 0.175);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io.pass.cpp
index d1640626..c7069aac 100644
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io.pass.cpp
@@ -16,7 +16,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const piecewise_linear_distribution& x);
-// 
+//
 // template <class charT, class traits>
 // basic_istream<charT, traits>&
 // operator>>(basic_istream<charT, traits>& is,
diff --git a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_init_func.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_init_func.pass.cpp
index 1b01b05e..357183fc 100644
--- a/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_init_func.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_init_func.pass.cpp
@@ -79,5 +79,5 @@ int main()
         assert(dn[1] == 0.125);
         assert(dn[2] == 0.175);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/io.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/io.pass.cpp
index ca70137f..b092e6fd 100644
--- a/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/io.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/io.pass.cpp
@@ -16,7 +16,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const uniform_int_distribution& x);
-// 
+//
 // template <class charT, class traits>
 // basic_istream<charT, traits>&
 // operator>>(basic_istream<charT, traits>& is,
diff --git a/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/io.pass.cpp b/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/io.pass.cpp
index 3ae2941b..5db3f5e8 100644
--- a/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/io.pass.cpp
+++ b/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/io.pass.cpp
@@ -16,7 +16,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const uniform_real_distribution& x);
-// 
+//
 // template <class charT, class traits>
 // basic_istream<charT, traits>&
 // operator>>(basic_istream<charT, traits>& is,
diff --git a/test/numerics/rand/rand.eng/rand.eng.lcong/io.pass.cpp b/test/numerics/rand/rand.eng/rand.eng.lcong/io.pass.cpp
index cde1df0a..aea6e4a6 100644
--- a/test/numerics/rand/rand.eng/rand.eng.lcong/io.pass.cpp
+++ b/test/numerics/rand/rand.eng/rand.eng.lcong/io.pass.cpp
@@ -17,7 +17,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const linear_congruential_engine<UIntType, a, c, m>& x);
-// 
+//
 // template <class charT, class traits,
 //           class UIntType, UIntType a, UIntType c, UIntType m>
 // basic_istream<charT, traits>&
diff --git a/test/numerics/rand/rand.eng/rand.eng.mers/io.pass.cpp b/test/numerics/rand/rand.eng/rand.eng.mers/io.pass.cpp
index bff194ca..95a6f788 100644
--- a/test/numerics/rand/rand.eng/rand.eng.mers/io.pass.cpp
+++ b/test/numerics/rand/rand.eng/rand.eng.mers/io.pass.cpp
@@ -21,7 +21,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& x);
-// 
+//
 // template <class charT, class traits,
 //           class UIntType, size_t w, size_t n, size_t m, size_t r,
 //           UIntType a, size_t u, UIntType d, size_t s,
diff --git a/test/numerics/rand/rand.eng/rand.eng.mers/values.pass.cpp b/test/numerics/rand/rand.eng/rand.eng.mers/values.pass.cpp
index e684a80e..af79f707 100644
--- a/test/numerics/rand/rand.eng/rand.eng.mers/values.pass.cpp
+++ b/test/numerics/rand/rand.eng/rand.eng.mers/values.pass.cpp
@@ -17,7 +17,7 @@
 // public:
 //     // types
 //     typedef UIntType result_type;
-// 
+//
 //     // engine characteristics
 //     static constexpr size_t word_size = w;
 //     static constexpr size_t state_size = n;
diff --git a/test/numerics/rand/rand.eng/rand.eng.sub/io.pass.cpp b/test/numerics/rand/rand.eng/rand.eng.sub/io.pass.cpp
index 5e09a6d0..a98ff671 100644
--- a/test/numerics/rand/rand.eng/rand.eng.sub/io.pass.cpp
+++ b/test/numerics/rand/rand.eng/rand.eng.sub/io.pass.cpp
@@ -17,7 +17,7 @@
 // basic_ostream<charT, traits>&
 // operator<<(basic_ostream<charT, traits>& os,
 //            const subtract_with_carry_engine<UIntType, w, s, r>& x);
-// 
+//
 // template <class charT, class traits,
 //           class UIntType, size_t w, size_t s, size_t r>
 // basic_istream<charT, traits>&
diff --git a/test/numerics/rand/rand.eng/rand.eng.sub/values.pass.cpp b/test/numerics/rand/rand.eng/rand.eng.sub/values.pass.cpp
index 417e4318..086b6c7c 100644
--- a/test/numerics/rand/rand.eng/rand.eng.sub/values.pass.cpp
+++ b/test/numerics/rand/rand.eng/rand.eng.sub/values.pass.cpp
@@ -15,7 +15,7 @@
 // public:
 //     // types
 //     typedef UIntType result_type;
-// 
+//
 //     // engine characteristics
 //     static constexpr size_t word_size = w;
 //     static constexpr size_t short_lag = s;
diff --git a/test/numerics/rand/rand.predef/default_random_engine.pass.cpp b/test/numerics/rand/rand.predef/default_random_engine.pass.cpp
index 91b0902c..ac949cd6 100644
--- a/test/numerics/rand/rand.predef/default_random_engine.pass.cpp
+++ b/test/numerics/rand/rand.predef/default_random_engine.pass.cpp
@@ -11,8 +11,6 @@
 
 // typedef minstd_rand0 default_random_engine;
 
-
-
 #include <random>
 #include <cassert>
 
diff --git a/test/numerics/rand/rand.util/rand.util.seedseq/generate.pass.cpp b/test/numerics/rand/rand.util/rand.util.seedseq/generate.pass.cpp
index 17ea16fa..f4229faf 100644
--- a/test/numerics/rand/rand.util/rand.util.seedseq/generate.pass.cpp
+++ b/test/numerics/rand/rand.util/rand.util.seedseq/generate.pass.cpp
@@ -17,8 +17,6 @@
 #include <random>
 #include <cassert>
 
-
-
 int main()
 {
     {
diff --git a/test/numerics/rand/rand.util/rand.util.seedseq/initializer_list.pass.cpp b/test/numerics/rand/rand.util/rand.util.seedseq/initializer_list.pass.cpp
index 61ff29c2..e8e1116b 100644
--- a/test/numerics/rand/rand.util/rand.util.seedseq/initializer_list.pass.cpp
+++ b/test/numerics/rand/rand.util/rand.util.seedseq/initializer_list.pass.cpp
@@ -29,5 +29,5 @@ int main()
     assert(b[2] == 3);
     assert(b[3] == 2);
     assert(b[4] == 1);
-#endif
+#endif  // _LIBCPP_MOVE
 }