diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.fail.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.fail.cpp
index f719ef23b..f3b052794 100644
--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.fail.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.fail.cpp
@@ -19,7 +19,7 @@
 
 
 int main()
-{  
+{
 //  Test the explicit deduction guides
     {
 //  queue(Compare, Container, const Alloc);
@@ -35,7 +35,7 @@ int main()
     }
 
     {
-//  priority_queue(Iter, Iter, Comp)  
+//  priority_queue(Iter, Iter, Comp)
 //  int is not an iterator
     std::priority_queue pri(15, 17, std::greater<double>());  // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'priority_queue'}}
     }
diff --git a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.pass.cpp b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.pass.cpp
index 2bf834e19..bcbe1276a 100644
--- a/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.pass.cpp
+++ b/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.pass.cpp
@@ -14,17 +14,17 @@
 // template<class Compare, class Container>
 // priority_queue(Compare, Container)
 //     -> priority_queue<typename Container::value_type, Container, Compare>;
-// 
+//
 // template<class InputIterator,
 //          class Compare = less<typename iterator_traits<InputIterator>::value_type>,
 //          class Container = vector<typename iterator_traits<InputIterator>::value_type>>
 // priority_queue(InputIterator, InputIterator, Compare = Compare(), Container = Container())
 //     -> priority_queue<typename iterator_traits<InputIterator>::value_type, Container, Compare>;
-// 
+//
 // template<class Compare, class Container, class Allocator>
 // priority_queue(Compare, Container, Allocator)
 //     -> priority_queue<typename Container::value_type, Container, Compare>;
-    
+
 
 #include <queue>
 #include <vector>
@@ -41,7 +41,7 @@ struct A {};
 
 int main()
 {
-  
+
 //  Test the explicit deduction guides
     {
     std::vector<int> v{0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -56,7 +56,7 @@ int main()
     std::vector<long, test_allocator<long>> v{10, 11, 12, 13, 14, 15, 16, 17, 18, 19 };
     std::priority_queue pri(std::greater<long>(), v, test_allocator<long>(2)); // priority_queue(Compare, Container, Allocator)
 
-    static_assert(std::is_same_v<decltype(pri), 
+    static_assert(std::is_same_v<decltype(pri),
                                  std::priority_queue<long, std::vector<long, test_allocator<long>>, std::greater<long>>>, "");
     assert(pri.size() == v.size());
     assert(pri.top() == 10);
diff --git a/test/std/containers/container.adaptors/queue/queue.cons/deduct.fail.cpp b/test/std/containers/container.adaptors/queue/queue.cons/deduct.fail.cpp
index de564de6f..1605b96b1 100644
--- a/test/std/containers/container.adaptors/queue/queue.cons/deduct.fail.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.cons/deduct.fail.cpp
@@ -19,7 +19,7 @@
 
 
 int main()
-{  
+{
 //  Test the explicit deduction guides
     {
 //  queue(const Container&, const Alloc&);
diff --git a/test/std/containers/container.adaptors/queue/queue.cons/deduct.pass.cpp b/test/std/containers/container.adaptors/queue/queue.cons/deduct.pass.cpp
index a219f4184..58cb7f535 100644
--- a/test/std/containers/container.adaptors/queue/queue.cons/deduct.pass.cpp
+++ b/test/std/containers/container.adaptors/queue/queue.cons/deduct.pass.cpp
@@ -16,8 +16,8 @@
 
 // template<class Container>
 //   queue(Container) -> queue<typename Container::value_type, Container>;
-//   
-// template<class Container, class Allocator> 
+//
+// template<class Container, class Allocator>
 //   queue(Container, Allocator) -> queue<typename Container::value_type, Container>;
 
 
@@ -36,7 +36,7 @@ struct A {};
 
 int main()
 {
-  
+
 //  Test the explicit deduction guides
     {
     std::list<int> l{0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -57,7 +57,7 @@ int main()
 //  I'd like to assert that we've gotten the right allocator in the queue, but
 //  I don't know how to get at the underlying container.
     }
-    
+
 //  Test the implicit deduction guides
     {
 //  We don't expect this one to work - no way to implicitly get value_type
diff --git a/test/std/containers/container.adaptors/stack/stack.cons/deduct.fail.cpp b/test/std/containers/container.adaptors/stack/stack.cons/deduct.fail.cpp
index e14965ada..e54b51084 100644
--- a/test/std/containers/container.adaptors/stack/stack.cons/deduct.fail.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.cons/deduct.fail.cpp
@@ -26,7 +26,7 @@
 
 
 int main()
-{  
+{
 //  Test the explicit deduction guides
     {
 //  stack(const Container&, const Alloc&);
diff --git a/test/std/containers/container.adaptors/stack/stack.cons/deduct.pass.cpp b/test/std/containers/container.adaptors/stack/stack.cons/deduct.pass.cpp
index 53e6cee7c..bb48f0e5e 100644
--- a/test/std/containers/container.adaptors/stack/stack.cons/deduct.pass.cpp
+++ b/test/std/containers/container.adaptors/stack/stack.cons/deduct.pass.cpp
@@ -17,8 +17,8 @@
 
 // template<class Container>
 //   stack(Container) -> stack<typename Container::value_type, Container>;
-//   
-// template<class Container, class Allocator> 
+//
+// template<class Container, class Allocator>
 //   stack(Container, Allocator) -> stack<typename Container::value_type, Container>;
 
 
@@ -38,7 +38,7 @@ struct A {};
 
 int main()
 {
-  
+
 //  Test the explicit deduction guides
     {
     std::vector<int> v{0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -59,7 +59,7 @@ int main()
 //  I'd like to assert that we've gotten the right allocator in the stack, but
 //  I don't know how to get at the underlying container.
     }
-    
+
 //  Test the implicit deduction guides
 
     {
diff --git a/test/std/containers/sequences/deque/deque.cons/deduct.fail.cpp b/test/std/containers/sequences/deque/deque.cons/deduct.fail.cpp
index 1f3fdbdae..61ab9c842 100644
--- a/test/std/containers/sequences/deque/deque.cons/deduct.fail.cpp
+++ b/test/std/containers/sequences/deque/deque.cons/deduct.fail.cpp
@@ -27,7 +27,7 @@
 struct A {};
 
 int main()
-{  
+{
 //  Test the explicit deduction guides
 
 //  Test the implicit deduction guides
diff --git a/test/std/containers/sequences/deque/deque.cons/deduct.pass.cpp b/test/std/containers/sequences/deque/deque.cons/deduct.pass.cpp
index 35a913e0e..a2ec262f1 100644
--- a/test/std/containers/sequences/deque/deque.cons/deduct.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.cons/deduct.pass.cpp
@@ -32,7 +32,7 @@ struct A {};
 
 int main()
 {
-  
+
 //  Test the explicit deduction guides
     {
     const int arr[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -51,7 +51,7 @@ int main()
     assert(deq[1] == 1L);
     assert(deq[2] == 2L);
     }
-    
+
 //  Test the implicit deduction guides
 
     {
diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp
index 9f0b70460..ef5b20ee7 100644
--- a/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp
@@ -27,7 +27,7 @@
 struct A {};
 
 int main()
-{  
+{
 //  Test the explicit deduction guides
 
 //  Test the implicit deduction guides
diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp
index b59bf7e0c..c3969a462 100644
--- a/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp
@@ -32,7 +32,7 @@ struct A {};
 
 int main()
 {
-  
+
 //  Test the explicit deduction guides
     {
     const int arr[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -52,7 +52,7 @@ int main()
     assert(*it++ == 1L);
     assert(*it++ == 2L);
     }
-    
+
 //  Test the implicit deduction guides
 
     {
diff --git a/test/std/containers/sequences/list/list.cons/deduct.fail.cpp b/test/std/containers/sequences/list/list.cons/deduct.fail.cpp
index c3709b795..5708d7373 100644
--- a/test/std/containers/sequences/list/list.cons/deduct.fail.cpp
+++ b/test/std/containers/sequences/list/list.cons/deduct.fail.cpp
@@ -27,7 +27,7 @@
 struct A {};
 
 int main()
-{  
+{
 //  Test the explicit deduction guides
 
 //  Test the implicit deduction guides
diff --git a/test/std/containers/sequences/list/list.cons/deduct.pass.cpp b/test/std/containers/sequences/list/list.cons/deduct.pass.cpp
index 66aa37acc..b8021ef98 100644
--- a/test/std/containers/sequences/list/list.cons/deduct.pass.cpp
+++ b/test/std/containers/sequences/list/list.cons/deduct.pass.cpp
@@ -32,7 +32,7 @@ struct A {};
 
 int main()
 {
-  
+
 //  Test the explicit deduction guides
     {
     const int arr[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -52,7 +52,7 @@ int main()
     assert(*it++ == 1L);
     assert(*it++ == 2L);
     }
-    
+
 //  Test the implicit deduction guides
 
     {
diff --git a/test/std/containers/sequences/vector/vector.cons/deduct.fail.cpp b/test/std/containers/sequences/vector/vector.cons/deduct.fail.cpp
index 31e66d92d..d47980012 100644
--- a/test/std/containers/sequences/vector/vector.cons/deduct.fail.cpp
+++ b/test/std/containers/sequences/vector/vector.cons/deduct.fail.cpp
@@ -25,7 +25,7 @@
 
 
 int main()
-{  
+{
 //  Test the explicit deduction guides
 
 //  Test the implicit deduction guides
diff --git a/test/std/containers/sequences/vector/vector.cons/deduct.pass.cpp b/test/std/containers/sequences/vector/vector.cons/deduct.pass.cpp
index 60392af6f..175fede78 100644
--- a/test/std/containers/sequences/vector/vector.cons/deduct.pass.cpp
+++ b/test/std/containers/sequences/vector/vector.cons/deduct.pass.cpp
@@ -32,7 +32,7 @@ struct A {};
 
 int main()
 {
-  
+
 //  Test the explicit deduction guides
     {
     const int arr[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -51,7 +51,7 @@ int main()
     assert(vec[1] == 1L);
     assert(vec[2] == 2L);
     }
-    
+
 //  Test the implicit deduction guides
 
     {
diff --git a/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp b/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp
index 0a63a4742..d030d12d2 100644
--- a/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp
+++ b/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp
@@ -47,7 +47,7 @@ int main () {
     {
     Outer o(0);
     }
-    
+
     assert(std::uncaught_exceptions() == 0);
     {
     try {
@@ -56,7 +56,7 @@ int main () {
         }
     catch (int) {
         assert(std::uncaught_exceptions() == 0);
-        }   
+        }
     }
     assert(std::uncaught_exceptions() == 0);
 }
diff --git a/test/std/re/re.regex/re.regex.construct/deduct.fail.cpp b/test/std/re/re.regex/re.regex.construct/deduct.fail.cpp
index c4d60a5a9..d4dc9e54f 100644
--- a/test/std/re/re.regex/re.regex.construct/deduct.fail.cpp
+++ b/test/std/re/re.regex/re.regex.construct/deduct.fail.cpp
@@ -26,7 +26,7 @@
 
 
 int main()
-{  
+{
 //  Test the explicit deduction guides
     {
 //	basic_regex(ForwardIterator, ForwardIterator)
diff --git a/test/std/re/re.regex/re.regex.construct/deduct.pass.cpp b/test/std/re/re.regex/re.regex.construct/deduct.pass.cpp
index 5dbd2f117..31f047c71 100644
--- a/test/std/re/re.regex/re.regex.construct/deduct.pass.cpp
+++ b/test/std/re/re.regex/re.regex.construct/deduct.pass.cpp
@@ -16,7 +16,7 @@
 // basic_regex(ForwardIterator, ForwardIterator,
 //             regex_constants::syntax_option_type = regex_constants::ECMAScript)
 // -> basic_regex<typename iterator_traits<ForwardIterator>::value_type>;
-        
+
 
 #include <regex>
 #include <string>
@@ -34,7 +34,7 @@ struct A {};
 
 int main()
 {
-  
+
 //  Test the explicit deduction guides
     {
 //  basic_regex(ForwardIterator, ForwardIterator)
@@ -54,7 +54,7 @@ int main()
     assert(re.flags() == std::regex_constants::basic);
     assert(re.mark_count() == 1);
     }
-    
+
 //  Test the implicit deduction guides
     {
 //  basic_regex(string);
@@ -87,7 +87,7 @@ int main()
     assert(re.flags() == std::regex_constants::grep);
     assert(re.mark_count() == 0);
     }
-    
+
     {
 //  basic_regex(const charT*, size_t);
     std::basic_regex re("ABCDEDEF", 7);
diff --git a/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp b/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
index b76b730d2..1e1e82b03 100644
--- a/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
+++ b/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp
@@ -25,7 +25,7 @@
 struct A {};
 
 int main()
-{  
+{
 //  Test the explicit deduction guides
 
 //  Test the implicit deduction guides
diff --git a/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp b/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
index e7aad1bf5..6ce35a489 100644
--- a/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
+++ b/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
@@ -25,7 +25,7 @@
 struct A {};
 
 int main()
-{  
+{
 //  Test the explicit deduction guides
     {
 //  optional(T)