diff --git a/test/containers/Copyable.h b/test/containers/Copyable.h
index 50b3b3117..121cef618 100644
--- a/test/containers/Copyable.h
+++ b/test/containers/Copyable.h
@@ -6,4 +6,4 @@ class Copyable
 public:
 };
 
-#endif
+#endif  // COPYABLE_H
diff --git a/test/containers/DefaultOnly.h b/test/containers/DefaultOnly.h
index d40e9c134..bdcf46d19 100644
--- a/test/containers/DefaultOnly.h
+++ b/test/containers/DefaultOnly.h
@@ -23,4 +23,4 @@ public:
 
 int DefaultOnly::count = 0;
 
-#endif
+#endif  // DEFAULTONLY_H
diff --git a/test/containers/Emplaceable.h b/test/containers/Emplaceable.h
index 10a660e46..5d457bbac 100644
--- a/test/containers/Emplaceable.h
+++ b/test/containers/Emplaceable.h
@@ -40,6 +40,6 @@ struct hash<Emplaceable>
 
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
-#endif
+#endif  // EMPLACEABLE_H
diff --git a/test/containers/MoveOnly.h b/test/containers/MoveOnly.h
index b7d62b713..c3468387e 100644
--- a/test/containers/MoveOnly.h
+++ b/test/containers/MoveOnly.h
@@ -21,8 +21,8 @@ public:
 
     int get() const {return data_;}
 
-    bool operator==(const MoveOnly& x) const {return data_ == x.data_;}    
-    bool operator< (const MoveOnly& x) const {return data_ <  x.data_;}    
+    bool operator==(const MoveOnly& x) const {return data_ == x.data_;}
+    bool operator< (const MoveOnly& x) const {return data_ <  x.data_;}
 };
 
 namespace std {
@@ -36,6 +36,6 @@ struct hash<MoveOnly>
 
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
-#endif
+#endif  // MOVEONLY_H
diff --git a/test/containers/NotConstructible.h b/test/containers/NotConstructible.h
index 04177362a..570500351 100644
--- a/test/containers/NotConstructible.h
+++ b/test/containers/NotConstructible.h
@@ -27,4 +27,4 @@ struct hash<NotConstructible>
 
 }
 
-#endif
+#endif  // NOTCONSTRUCTIBLE_H
diff --git a/test/containers/associative/map/map.access/index_rv_key.pass.cpp b/test/containers/associative/map/map.access/index_rv_key.pass.cpp
index 80e9390f4..ade5b9bf8 100644
--- a/test/containers/associative/map/map.access/index_rv_key.pass.cpp
+++ b/test/containers/associative/map/map.access/index_rv_key.pass.cpp
@@ -34,5 +34,5 @@ int main()
     m[6] = 6.5;
     assert(m[6] == 6.5);
     assert(m.size() == 2);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.access/iterator.pass.cpp b/test/containers/associative/map/map.access/iterator.pass.cpp
index d5f1d04ea..4de0889f6 100644
--- a/test/containers/associative/map/map.access/iterator.pass.cpp
+++ b/test/containers/associative/map/map.access/iterator.pass.cpp
@@ -15,12 +15,12 @@
 // const_iterator begin() const;
 //       iterator end();
 // const_iterator end()   const;
-// 
+//
 //       reverse_iterator rbegin();
 // const_reverse_iterator rbegin() const;
 //       reverse_iterator rend();
 // const_reverse_iterator rend()   const;
-// 
+//
 // const_iterator         cbegin()  const;
 // const_iterator         cend()    const;
 // const_reverse_iterator crbegin() const;
diff --git a/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp b/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
index 1673c54ca..3a5ffa73d 100644
--- a/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
+++ b/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
@@ -24,7 +24,7 @@ int main()
                             {
                                 {20, 1},
                             };
-    m = 
+    m =
                             {
                                 {1, 1},
                                 {1, 1.5},
@@ -41,5 +41,5 @@ int main()
     assert(*m.begin() == V(1, 1));
     assert(*next(m.begin()) == V(2, 1));
     assert(*next(m.begin(), 2) == V(3, 1));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.cons/copy.pass.cpp b/test/containers/associative/map/map.cons/copy.pass.cpp
index d1f928885..6975d6073 100644
--- a/test/containers/associative/map/map.cons/copy.pass.cpp
+++ b/test/containers/associative/map/map.cons/copy.pass.cpp
@@ -46,7 +46,7 @@ int main()
         assert(*m.begin() == V(1, 1));
         assert(*next(m.begin()) == V(2, 1));
         assert(*next(m.begin(), 2) == V(3, 1));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -81,7 +81,7 @@ int main()
         assert(*m.begin() == V(1, 1));
         assert(*next(m.begin()) == V(2, 1));
         assert(*next(m.begin(), 2) == V(3, 1));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -90,5 +90,5 @@ int main()
         assert(*next(mo.begin()) == V(2, 1));
         assert(*next(mo.begin(), 2) == V(3, 1));
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/associative/map/map.cons/copy_assign.pass.cpp b/test/containers/associative/map/map.cons/copy_assign.pass.cpp
index 945125c98..3f98368d4 100644
--- a/test/containers/associative/map/map.cons/copy_assign.pass.cpp
+++ b/test/containers/associative/map/map.cons/copy_assign.pass.cpp
@@ -47,7 +47,7 @@ int main()
         assert(*m.begin() == V(1, 1));
         assert(*next(m.begin()) == V(2, 1));
         assert(*next(m.begin(), 2) == V(3, 1));
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -82,7 +82,7 @@ int main()
         assert(*m.begin() == V(1, 1));
         assert(*next(m.begin()) == V(2, 1));
         assert(*next(m.begin(), 2) == V(3, 1));
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
diff --git a/test/containers/associative/map/map.cons/initializer_list.pass.cpp b/test/containers/associative/map/map.cons/initializer_list.pass.cpp
index e56bf8496..02ae034a1 100644
--- a/test/containers/associative/map/map.cons/initializer_list.pass.cpp
+++ b/test/containers/associative/map/map.cons/initializer_list.pass.cpp
@@ -37,5 +37,5 @@ int main()
     assert(*m.begin() == V(1, 1));
     assert(*next(m.begin()) == V(2, 1));
     assert(*next(m.begin(), 2) == V(3, 1));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp b/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
index dba0cdcd4..d47fb41ab 100644
--- a/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
+++ b/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
@@ -39,5 +39,5 @@ int main()
     assert(*next(m.begin()) == V(2, 1));
     assert(*next(m.begin(), 2) == V(3, 1));
     assert(m.key_comp() == C(3));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
index fafc80d0b..221b25185 100644
--- a/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
+++ b/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
@@ -42,5 +42,5 @@ int main()
     assert(*next(m.begin(), 2) == V(3, 1));
     assert(m.key_comp() == C(3));
     assert(m.get_allocator() == A(6));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.cons/move.pass.cpp b/test/containers/associative/map/map.cons/move.pass.cpp
index 22a164cc2..a36bba4eb 100644
--- a/test/containers/associative/map/map.cons/move.pass.cpp
+++ b/test/containers/associative/map/map.cons/move.pass.cpp
@@ -32,7 +32,7 @@ int main()
         assert(m.key_comp() == C(5));
         assert(m.size() == 0);
         assert(distance(m.begin(), m.end()) == 0);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
@@ -62,11 +62,11 @@ int main()
         assert(*m.begin() == V(1, 1));
         assert(*next(m.begin()) == V(2, 1));
         assert(*next(m.begin(), 2) == V(3, 1));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
         assert(distance(mo.begin(), mo.end()) == 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.cons/move_alloc.pass.cpp b/test/containers/associative/map/map.cons/move_alloc.pass.cpp
index c235bc01c..4ecc434a6 100644
--- a/test/containers/associative/map/map.cons/move_alloc.pass.cpp
+++ b/test/containers/associative/map/map.cons/move_alloc.pass.cpp
@@ -140,5 +140,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.cons/move_assign.pass.cpp b/test/containers/associative/map/map.cons/move_assign.pass.cpp
index 423f30a2e..498c4fa4a 100644
--- a/test/containers/associative/map/map.cons/move_assign.pass.cpp
+++ b/test/containers/associative/map/map.cons/move_assign.pass.cpp
@@ -143,5 +143,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.modifiers/emplace.pass.cpp b/test/containers/associative/map/map.modifiers/emplace.pass.cpp
index 0535047af..258b87f0c 100644
--- a/test/containers/associative/map/map.modifiers/emplace.pass.cpp
+++ b/test/containers/associative/map/map.modifiers/emplace.pass.cpp
@@ -85,5 +85,5 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp b/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
index 6311b883d..d4e3676d4 100644
--- a/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
+++ b/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
@@ -78,5 +78,5 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp b/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
index 39cbbe6d0..ec1b80b30 100644
--- a/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
+++ b/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
@@ -39,5 +39,5 @@ int main()
     assert(*m.begin() == V(1, 1));
     assert(*next(m.begin()) == V(2, 1));
     assert(*next(m.begin(), 2) == V(3, 1));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp b/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
index 15753d7eb..6e066c5b4 100644
--- a/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
+++ b/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
@@ -51,5 +51,5 @@ int main()
         assert(r->first == 3);
         assert(r->second == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp b/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
index 077d28343..b4a4ee0bf 100644
--- a/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
+++ b/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
@@ -54,5 +54,5 @@ int main()
         assert(r.first->first == 3);
         assert(r.first->second == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/iterator.pass.cpp b/test/containers/associative/multimap/iterator.pass.cpp
index a81c3f59d..c6844d9c8 100644
--- a/test/containers/associative/multimap/iterator.pass.cpp
+++ b/test/containers/associative/multimap/iterator.pass.cpp
@@ -15,12 +15,12 @@
 // const_iterator begin() const;
 //       iterator end();
 // const_iterator end()   const;
-// 
+//
 //       reverse_iterator rbegin();
 // const_reverse_iterator rbegin() const;
 //       reverse_iterator rend();
 // const_reverse_iterator rend()   const;
-// 
+//
 // const_iterator         cbegin()  const;
 // const_iterator         cend()    const;
 // const_reverse_iterator crbegin() const;
diff --git a/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp b/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
index 209148cfc..948c689f4 100644
--- a/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
@@ -22,7 +22,7 @@ int main()
     typedef std::multimap<int, double> C;
     typedef C::value_type V;
     C m = {{20, 1}};
-    m = 
+    m =
            {
                {1, 1},
                {1, 1.5},
@@ -46,5 +46,5 @@ int main()
     assert(*++i == V(3, 1));
     assert(*++i == V(3, 1.5));
     assert(*++i == V(3, 2));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.cons/copy.pass.cpp b/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
index 531ef93e1..f1b743be2 100644
--- a/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
@@ -42,7 +42,7 @@ int main()
         assert(m == mo);
         assert(m.get_allocator() == A(7));
         assert(m.key_comp() == C(5));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
     }
@@ -68,9 +68,9 @@ int main()
         assert(m == mo);
         assert(m.get_allocator() == A(-2));
         assert(m.key_comp() == C(5));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp b/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
index 57d0ef3d0..158accca8 100644
--- a/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
@@ -43,7 +43,7 @@ int main()
         assert(m == mo);
         assert(m.get_allocator() == A(7));
         assert(m.key_comp() == C(5));
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
     }
@@ -69,7 +69,7 @@ int main()
         assert(m == mo);
         assert(m.get_allocator() == A(2));
         assert(m.key_comp() == C(5));
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
     }
diff --git a/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp b/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
index e24e6018b..862487bda 100644
--- a/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
@@ -45,5 +45,5 @@ int main()
     assert(*++i == V(3, 1));
     assert(*++i == V(3, 1.5));
     assert(*++i == V(3, 2));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp b/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
index 0cb785bc4..542697f2c 100644
--- a/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
@@ -50,5 +50,5 @@ int main()
     assert(*++i == V(3, 1.5));
     assert(*++i == V(3, 2));
     assert(m.key_comp() == Cmp(4));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
index 681936b57..24bf9758c 100644
--- a/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
@@ -53,5 +53,5 @@ int main()
     assert(*++i == V(3, 2));
     assert(m.key_comp() == Cmp(4));
     assert(m.get_allocator() == A(5));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.cons/move.pass.cpp b/test/containers/associative/multimap/multimap.cons/move.pass.cpp
index 1c6109f48..3272212e2 100644
--- a/test/containers/associative/multimap/multimap.cons/move.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/move.pass.cpp
@@ -32,7 +32,7 @@ int main()
         assert(m.key_comp() == C(5));
         assert(m.size() == 0);
         assert(distance(m.begin(), m.end()) == 0);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
@@ -68,11 +68,11 @@ int main()
         assert(*next(m.begin(), 6) == V(3, 1));
         assert(*next(m.begin(), 7) == V(3, 1.5));
         assert(*next(m.begin(), 8) == V(3, 2));
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
         assert(distance(mo.begin(), mo.end()) == 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
index a1321ae31..b22debaba 100644
--- a/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
@@ -140,5 +140,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp b/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
index c6a1f6689..a7dccd3ff 100644
--- a/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
+++ b/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
@@ -143,5 +143,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp b/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
index ea85371d9..811f1bf26 100644
--- a/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
+++ b/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
@@ -78,5 +78,5 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp b/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
index 98630dbd9..c7d5895a3 100644
--- a/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
+++ b/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
@@ -78,5 +78,5 @@ int main()
         assert(m.begin()->first == 2);
         assert(m.begin()->second == 3.5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp b/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
index 2cd525830..93aab71ae 100644
--- a/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
+++ b/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
@@ -49,5 +49,5 @@ int main()
     assert(*++i == V(3, 1));
     assert(*++i == V(3, 2));
     assert(*++i == V(3, 1.5));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp b/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
index eb89b136f..311ce01c2 100644
--- a/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
+++ b/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
@@ -51,5 +51,5 @@ int main()
         assert(r->first == 3);
         assert(r->second == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp b/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
index b9463c431..5b39998d3 100644
--- a/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
+++ b/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
@@ -50,5 +50,5 @@ int main()
         assert(r->first == 3);
         assert(r->second == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/emplace.pass.cpp b/test/containers/associative/multiset/emplace.pass.cpp
index 30a23b020..df2d65690 100644
--- a/test/containers/associative/multiset/emplace.pass.cpp
+++ b/test/containers/associative/multiset/emplace.pass.cpp
@@ -67,5 +67,5 @@ int main()
         assert(m.size() == 1);
         assert(*r == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/emplace_hint.pass.cpp b/test/containers/associative/multiset/emplace_hint.pass.cpp
index 84442261c..44806984c 100644
--- a/test/containers/associative/multiset/emplace_hint.pass.cpp
+++ b/test/containers/associative/multiset/emplace_hint.pass.cpp
@@ -67,5 +67,5 @@ int main()
         assert(m.size() == 1);
         assert(*r == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/insert_initializer_list.pass.cpp b/test/containers/associative/multiset/insert_initializer_list.pass.cpp
index d723811f2..b7c1f2d55 100644
--- a/test/containers/associative/multiset/insert_initializer_list.pass.cpp
+++ b/test/containers/associative/multiset/insert_initializer_list.pass.cpp
@@ -34,5 +34,5 @@ int main()
     assert(*++i == V(6));
     assert(*++i == V(8));
     assert(*++i == V(10));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/insert_iter_rv.pass.cpp b/test/containers/associative/multiset/insert_iter_rv.pass.cpp
index 61ac19144..dde5c002e 100644
--- a/test/containers/associative/multiset/insert_iter_rv.pass.cpp
+++ b/test/containers/associative/multiset/insert_iter_rv.pass.cpp
@@ -45,5 +45,5 @@ int main()
         assert(m.size() == 4);
         assert(*r == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/insert_rv.pass.cpp b/test/containers/associative/multiset/insert_rv.pass.cpp
index ca66aaff8..19e61191b 100644
--- a/test/containers/associative/multiset/insert_rv.pass.cpp
+++ b/test/containers/associative/multiset/insert_rv.pass.cpp
@@ -45,5 +45,5 @@ int main()
         assert(m.size() == 4);
         assert(*r == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/iterator.pass.cpp b/test/containers/associative/multiset/iterator.pass.cpp
index 54c41ef4c..154d94a41 100644
--- a/test/containers/associative/multiset/iterator.pass.cpp
+++ b/test/containers/associative/multiset/iterator.pass.cpp
@@ -15,12 +15,12 @@
 // const_iterator begin() const;
 //       iterator end();
 // const_iterator end()   const;
-// 
+//
 //       reverse_iterator rbegin();
 // const_reverse_iterator rbegin() const;
 //       reverse_iterator rend();
 // const_reverse_iterator rend()   const;
-// 
+//
 // const_iterator         cbegin()  const;
 // const_iterator         cend()    const;
 // const_reverse_iterator crbegin() const;
diff --git a/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp b/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
index 803c245a5..2420126eb 100644
--- a/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
@@ -32,5 +32,5 @@ int main()
     assert(*++i == V(4));
     assert(*++i == V(5));
     assert(*++i == V(6));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/multiset.cons/copy.pass.cpp b/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
index f9e5e418c..86be5e71e 100644
--- a/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
@@ -52,7 +52,7 @@ int main()
         assert(*next(m.begin(), 6) == 3);
         assert(*next(m.begin(), 7) == 3);
         assert(*next(m.begin(), 8) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 9);
@@ -99,7 +99,7 @@ int main()
         assert(*next(m.begin(), 6) == 3);
         assert(*next(m.begin(), 7) == 3);
         assert(*next(m.begin(), 8) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 9);
@@ -114,5 +114,5 @@ int main()
         assert(*next(mo.begin(), 7) == 3);
         assert(*next(mo.begin(), 8) == 3);
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp b/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
index 2016ca39b..5d1f422ec 100644
--- a/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
@@ -53,7 +53,7 @@ int main()
         assert(*next(m.begin(), 6) == 3);
         assert(*next(m.begin(), 7) == 3);
         assert(*next(m.begin(), 8) == 3);
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 9);
@@ -100,7 +100,7 @@ int main()
         assert(*next(m.begin(), 6) == 3);
         assert(*next(m.begin(), 7) == 3);
         assert(*next(m.begin(), 8) == 3);
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 9);
diff --git a/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp b/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
index 70817cb93..9f51ad6fc 100644
--- a/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
@@ -31,5 +31,5 @@ int main()
     assert(*++i == V(4));
     assert(*++i == V(5));
     assert(*++i == V(6));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp b/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
index 363af5418..b737d278b 100644
--- a/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
@@ -34,5 +34,5 @@ int main()
     assert(*++i == V(5));
     assert(*++i == V(6));
     assert(m.key_comp() == Cmp(10));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
index 467441d15..b85179374 100644
--- a/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
@@ -37,5 +37,5 @@ int main()
     assert(*++i == V(6));
     assert(m.key_comp() == Cmp(10));
     assert(m.get_allocator() == A(4));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/multiset.cons/move.pass.cpp b/test/containers/associative/multiset/multiset.cons/move.pass.cpp
index 3393bc66b..e392733c9 100644
--- a/test/containers/associative/multiset/multiset.cons/move.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/move.pass.cpp
@@ -32,7 +32,7 @@ int main()
         assert(m.key_comp() == C(5));
         assert(m.size() == 0);
         assert(distance(m.begin(), m.end()) == 0);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
@@ -69,11 +69,11 @@ int main()
         assert(*next(m.begin(), 6) == 3);
         assert(*next(m.begin(), 7) == 3);
         assert(*next(m.begin(), 8) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
         assert(distance(mo.begin(), mo.end()) == 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
index 6e34f3717..9043047ef 100644
--- a/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
@@ -137,5 +137,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp b/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
index 93efddbd7..778a11397 100644
--- a/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
+++ b/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
@@ -140,5 +140,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/emplace.pass.cpp b/test/containers/associative/set/emplace.pass.cpp
index f29a93b0d..2082d5410 100644
--- a/test/containers/associative/set/emplace.pass.cpp
+++ b/test/containers/associative/set/emplace.pass.cpp
@@ -73,5 +73,5 @@ int main()
         assert(m.size() == 1);
         assert(*r.first == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/emplace_hint.pass.cpp b/test/containers/associative/set/emplace_hint.pass.cpp
index d17603a88..faa7e1d7d 100644
--- a/test/containers/associative/set/emplace_hint.pass.cpp
+++ b/test/containers/associative/set/emplace_hint.pass.cpp
@@ -67,5 +67,5 @@ int main()
         assert(m.size() == 1);
         assert(*r == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/insert_initializer_list.pass.cpp b/test/containers/associative/set/insert_initializer_list.pass.cpp
index 2d403d9d8..5cc6a6941 100644
--- a/test/containers/associative/set/insert_initializer_list.pass.cpp
+++ b/test/containers/associative/set/insert_initializer_list.pass.cpp
@@ -34,5 +34,5 @@ int main()
     assert(*++i == V(6));
     assert(*++i == V(8));
     assert(*++i == V(10));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/insert_iter_rv.pass.cpp b/test/containers/associative/set/insert_iter_rv.pass.cpp
index 8231bbbfc..16161787a 100644
--- a/test/containers/associative/set/insert_iter_rv.pass.cpp
+++ b/test/containers/associative/set/insert_iter_rv.pass.cpp
@@ -45,5 +45,5 @@ int main()
         assert(m.size() == 3);
         assert(*r == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/insert_rv.pass.cpp b/test/containers/associative/set/insert_rv.pass.cpp
index b77307861..d4fa699aa 100644
--- a/test/containers/associative/set/insert_rv.pass.cpp
+++ b/test/containers/associative/set/insert_rv.pass.cpp
@@ -49,5 +49,5 @@ int main()
         assert(m.size() == 3);
         assert(*r.first == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/iterator.pass.cpp b/test/containers/associative/set/iterator.pass.cpp
index e6627fb3d..2f5bc53b8 100644
--- a/test/containers/associative/set/iterator.pass.cpp
+++ b/test/containers/associative/set/iterator.pass.cpp
@@ -15,12 +15,12 @@
 // const_iterator begin() const;
 //       iterator end();
 // const_iterator end()   const;
-// 
+//
 //       reverse_iterator rbegin();
 // const_reverse_iterator rbegin() const;
 //       reverse_iterator rend();
 // const_reverse_iterator rend()   const;
-// 
+//
 // const_iterator         cbegin()  const;
 // const_iterator         cend()    const;
 // const_reverse_iterator crbegin() const;
diff --git a/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp b/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
index aba35be52..49c9b843f 100644
--- a/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
+++ b/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
@@ -32,5 +32,5 @@ int main()
     assert(*++i == V(4));
     assert(*++i == V(5));
     assert(*++i == V(6));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/set.cons/copy.pass.cpp b/test/containers/associative/set/set.cons/copy.pass.cpp
index 01972cdaf..5602e6e56 100644
--- a/test/containers/associative/set/set.cons/copy.pass.cpp
+++ b/test/containers/associative/set/set.cons/copy.pass.cpp
@@ -46,7 +46,7 @@ int main()
         assert(*m.begin() == 1);
         assert(*next(m.begin()) == 2);
         assert(*next(m.begin(), 2) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -81,7 +81,7 @@ int main()
         assert(*m.begin() == 1);
         assert(*next(m.begin()) == 2);
         assert(*next(m.begin(), 2) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -90,5 +90,5 @@ int main()
         assert(*next(mo.begin()) == 2);
         assert(*next(mo.begin(), 2) == 3);
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/associative/set/set.cons/copy_assign.pass.cpp b/test/containers/associative/set/set.cons/copy_assign.pass.cpp
index 34a9f69e4..71c433f8c 100644
--- a/test/containers/associative/set/set.cons/copy_assign.pass.cpp
+++ b/test/containers/associative/set/set.cons/copy_assign.pass.cpp
@@ -47,7 +47,7 @@ int main()
         assert(*m.begin() == 1);
         assert(*next(m.begin()) == 2);
         assert(*next(m.begin(), 2) == 3);
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
@@ -82,7 +82,7 @@ int main()
         assert(*m.begin() == 1);
         assert(*next(m.begin()) == 2);
         assert(*next(m.begin(), 2) == 3);
-    
+
         assert(mo.get_allocator() == A(2));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 3);
diff --git a/test/containers/associative/set/set.cons/initializer_list.pass.cpp b/test/containers/associative/set/set.cons/initializer_list.pass.cpp
index 333174fcc..8fef24b18 100644
--- a/test/containers/associative/set/set.cons/initializer_list.pass.cpp
+++ b/test/containers/associative/set/set.cons/initializer_list.pass.cpp
@@ -31,5 +31,5 @@ int main()
     assert(*++i == V(4));
     assert(*++i == V(5));
     assert(*++i == V(6));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp b/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp
index 75eaa208d..65f539d32 100644
--- a/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp
+++ b/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp
@@ -34,5 +34,5 @@ int main()
     assert(*++i == V(5));
     assert(*++i == V(6));
     assert(m.key_comp() == Cmp(10));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp b/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
index 9e868d6b5..418c551f4 100644
--- a/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
+++ b/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
@@ -37,5 +37,5 @@ int main()
     assert(*++i == V(6));
     assert(m.key_comp() == Cmp(10));
     assert(m.get_allocator() == A(4));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/set.cons/move.pass.cpp b/test/containers/associative/set/set.cons/move.pass.cpp
index d5b910e31..df46c5d62 100644
--- a/test/containers/associative/set/set.cons/move.pass.cpp
+++ b/test/containers/associative/set/set.cons/move.pass.cpp
@@ -32,7 +32,7 @@ int main()
         assert(m.key_comp() == C(5));
         assert(m.size() == 0);
         assert(distance(m.begin(), m.end()) == 0);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
@@ -63,11 +63,11 @@ int main()
         assert(*m.begin() == 1);
         assert(*next(m.begin()) == 2);
         assert(*next(m.begin(), 2) == 3);
-    
+
         assert(mo.get_allocator() == A(7));
         assert(mo.key_comp() == C(5));
         assert(mo.size() == 0);
         assert(distance(mo.begin(), mo.end()) == 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/set.cons/move_alloc.pass.cpp b/test/containers/associative/set/set.cons/move_alloc.pass.cpp
index 6f39cddbf..653c60fcd 100644
--- a/test/containers/associative/set/set.cons/move_alloc.pass.cpp
+++ b/test/containers/associative/set/set.cons/move_alloc.pass.cpp
@@ -137,5 +137,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/set/set.cons/move_assign.pass.cpp b/test/containers/associative/set/set.cons/move_assign.pass.cpp
index 3a7433bef..e2fd21d58 100644
--- a/test/containers/associative/set/set.cons/move_assign.pass.cpp
+++ b/test/containers/associative/set/set.cons/move_assign.pass.cpp
@@ -140,5 +140,5 @@ int main()
         assert(m3.key_comp() == C(5));
         assert(m1.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/associative/tree_balance_after_insert.pass.cpp b/test/containers/associative/tree_balance_after_insert.pass.cpp
index 26d8e2779..bb0861bd3 100644
--- a/test/containers/associative/tree_balance_after_insert.pass.cpp
+++ b/test/containers/associative/tree_balance_after_insert.pass.cpp
@@ -36,50 +36,50 @@ test1()
         Node b;
         Node c;
         Node d;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &a;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = 0;
         d.__right_ = 0;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &b;
         a.__left_ = 0;
         a.__right_ = 0;
         a.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
 
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == &a);
         assert(b.__right_ == 0);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == 0);
         assert(d.__right_ == 0);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -91,50 +91,50 @@ test1()
         Node b;
         Node c;
         Node d;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = 0;
         b.__right_ = &a;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = 0;
         d.__right_ = 0;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &b;
         a.__left_ = 0;
         a.__right_ = 0;
         a.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == 0);
         assert(b.__right_ == &a);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == 0);
         assert(d.__right_ == 0);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -146,50 +146,50 @@ test1()
         Node b;
         Node c;
         Node d;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = 0;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = &a;
         d.__right_ = 0;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &d;
         a.__left_ = 0;
         a.__right_ = 0;
         a.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == 0);
         assert(b.__right_ == 0);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == &a);
         assert(d.__right_ == 0);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &d);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -201,50 +201,50 @@ test1()
         Node b;
         Node c;
         Node d;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = 0;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = 0;
         d.__right_ = &a;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &d;
         a.__left_ = 0;
         a.__right_ = 0;
         a.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == 0);
         assert(b.__right_ == 0);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == 0);
         assert(d.__right_ == &a);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &d);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -261,24 +261,24 @@ test1()
         Node g;
         Node h;
         Node i;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &a;
         b.__right_ = &g;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = &h;
         d.__right_ = &i;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &b;
         a.__left_ = &e;
         a.__right_ = &f;
@@ -286,40 +286,40 @@ test1()
 
         e.__parent_ = &a;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &a;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &b;
         g.__is_black_ = true;
-    
+
         h.__parent_ = &d;
         h.__is_black_ = true;
-    
+
         i.__parent_ = &d;
         i.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == &a);
         assert(b.__right_ == &g);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == &h);
         assert(d.__right_ == &i);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &e);
         assert(a.__right_ == &f);
@@ -336,24 +336,24 @@ test1()
         Node g;
         Node h;
         Node i;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &g;
         b.__right_ = &a;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = &h;
         d.__right_ = &i;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &b;
         a.__left_ = &e;
         a.__right_ = &f;
@@ -361,40 +361,40 @@ test1()
 
         e.__parent_ = &a;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &a;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &b;
         g.__is_black_ = true;
-    
+
         h.__parent_ = &d;
         h.__is_black_ = true;
-    
+
         i.__parent_ = &d;
         i.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == &g);
         assert(b.__right_ == &a);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == &h);
         assert(d.__right_ == &i);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &e);
         assert(a.__right_ == &f);
@@ -411,24 +411,24 @@ test1()
         Node g;
         Node h;
         Node i;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &g;
         b.__right_ = &h;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = &a;
         d.__right_ = &i;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &d;
         a.__left_ = &e;
         a.__right_ = &f;
@@ -436,40 +436,40 @@ test1()
 
         e.__parent_ = &a;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &a;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &b;
         g.__is_black_ = true;
-    
+
         h.__parent_ = &b;
         h.__is_black_ = true;
-    
+
         i.__parent_ = &d;
         i.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == &g);
         assert(b.__right_ == &h);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == &a);
         assert(d.__right_ == &i);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &d);
         assert(a.__left_ == &e);
         assert(a.__right_ == &f);
@@ -486,24 +486,24 @@ test1()
         Node g;
         Node h;
         Node i;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &d;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &g;
         b.__right_ = &h;
         b.__is_black_ = false;
-    
+
         d.__parent_ = &c;
         d.__left_ = &i;
         d.__right_ = &a;
         d.__is_black_ = false;
-    
+
         a.__parent_ = &d;
         a.__left_ = &e;
         a.__right_ = &f;
@@ -511,40 +511,40 @@ test1()
 
         e.__parent_ = &a;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &a;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &b;
         g.__is_black_ = true;
-    
+
         h.__parent_ = &b;
         h.__is_black_ = true;
-    
+
         i.__parent_ = &d;
         i.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &c);
-    
+
         assert(c.__parent_ == &root);
         assert(c.__left_ == &b);
         assert(c.__right_ == &d);
         assert(c.__is_black_ == true);
-    
+
         assert(b.__parent_ == &c);
         assert(b.__left_ == &g);
         assert(b.__right_ == &h);
         assert(b.__is_black_ == true);
-    
+
         assert(d.__parent_ == &c);
         assert(d.__left_ == &i);
         assert(d.__right_ == &a);
         assert(d.__is_black_ == true);
-    
+
         assert(a.__parent_ == &d);
         assert(a.__left_ == &e);
         assert(a.__right_ == &f);
@@ -560,35 +560,35 @@ test2()
         Node a;
         Node b;
         Node c;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &a;
         c.__right_ = 0;
         c.__is_black_ = true;
-    
+
         a.__parent_ = &c;
         a.__left_ = 0;
         a.__right_ = &b;
         a.__is_black_ = false;
-    
+
         b.__parent_ = &a;
         b.__left_ = 0;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &b);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -604,30 +604,30 @@ test2()
         Node a;
         Node b;
         Node c;
-    
+
         root.__left_ = &a;
-    
+
         a.__parent_ = &root;
         a.__left_ = 0;
         a.__right_ = &c;
         a.__is_black_ = true;
-    
+
         c.__parent_ = &a;
         c.__left_ = &b;
         c.__right_ = 0;
         c.__is_black_ = false;
-    
+
         b.__parent_ = &c;
         b.__left_ = 0;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &b);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -637,7 +637,7 @@ test2()
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(b.__parent_ == &root);
         assert(b.__left_ == &a);
         assert(b.__right_ == &c);
@@ -652,19 +652,19 @@ test2()
         Node e;
         Node f;
         Node g;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &a;
         c.__right_ = &g;
         c.__is_black_ = true;
-    
+
         a.__parent_ = &c;
         a.__left_ = &d;
         a.__right_ = &b;
         a.__is_black_ = false;
-    
+
         b.__parent_ = &a;
         b.__left_ = &e;
         b.__right_ = &f;
@@ -672,27 +672,27 @@ test2()
 
         d.__parent_ = &a;
         d.__is_black_ = true;
-    
+
         e.__parent_ = &b;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &b;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &c;
         g.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &b);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == &f);
         assert(c.__right_ == &g);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &d);
         assert(a.__right_ == &e);
@@ -724,19 +724,19 @@ test2()
         Node e;
         Node f;
         Node g;
-    
+
         root.__left_ = &a;
-    
+
         a.__parent_ = &root;
         a.__left_ = &d;
         a.__right_ = &c;
         a.__is_black_ = true;
-    
+
         c.__parent_ = &a;
         c.__left_ = &b;
         c.__right_ = &g;
         c.__is_black_ = false;
-    
+
         b.__parent_ = &c;
         b.__left_ = &e;
         b.__right_ = &f;
@@ -744,27 +744,27 @@ test2()
 
         d.__parent_ = &a;
         d.__is_black_ = true;
-    
+
         e.__parent_ = &b;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &b;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &c;
         g.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &b);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == &f);
         assert(c.__right_ == &g);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &d);
         assert(a.__right_ == &e);
@@ -797,35 +797,35 @@ test3()
         Node a;
         Node b;
         Node c;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = 0;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &a;
         b.__right_ = 0;
         b.__is_black_ = false;
-    
+
         a.__parent_ = &b;
         a.__left_ = 0;
         a.__right_ = 0;
         a.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -841,30 +841,30 @@ test3()
         Node a;
         Node b;
         Node c;
-    
+
         root.__left_ = &a;
-    
+
         a.__parent_ = &root;
         a.__left_ = 0;
         a.__right_ = &b;
         a.__is_black_ = true;
-    
+
         b.__parent_ = &a;
         b.__left_ = 0;
         b.__right_ = &c;
         b.__is_black_ = false;
-    
+
         c.__parent_ = &b;
         c.__left_ = 0;
         c.__right_ = 0;
         c.__is_black_ = false;
-    
+
         std::__tree_balance_after_insert(root.__left_, &c);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == 0);
         assert(a.__right_ == 0);
@@ -874,7 +874,7 @@ test3()
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(b.__parent_ == &root);
         assert(b.__left_ == &a);
         assert(b.__right_ == &c);
@@ -889,14 +889,14 @@ test3()
         Node e;
         Node f;
         Node g;
-    
+
         root.__left_ = &c;
-    
+
         c.__parent_ = &root;
         c.__left_ = &b;
         c.__right_ = &g;
         c.__is_black_ = true;
-    
+
         b.__parent_ = &c;
         b.__left_ = &a;
         b.__right_ = &f;
@@ -906,30 +906,30 @@ test3()
         a.__left_ = &d;
         a.__right_ = &e;
         a.__is_black_ = false;
-    
+
         d.__parent_ = &a;
         d.__is_black_ = true;
-    
+
         e.__parent_ = &a;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &b;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &c;
         g.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &a);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == &f);
         assert(c.__right_ == &g);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &d);
         assert(a.__right_ == &e);
@@ -961,14 +961,14 @@ test3()
         Node e;
         Node f;
         Node g;
-    
+
         root.__left_ = &a;
-    
+
         a.__parent_ = &root;
         a.__left_ = &d;
         a.__right_ = &b;
         a.__is_black_ = true;
-    
+
         b.__parent_ = &a;
         b.__left_ = &e;
         b.__right_ = &c;
@@ -978,30 +978,30 @@ test3()
         c.__left_ = &f;
         c.__right_ = &g;
         c.__is_black_ = false;
-    
+
         d.__parent_ = &a;
         d.__is_black_ = true;
-    
+
         e.__parent_ = &b;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &c;
         f.__is_black_ = true;
-    
+
         g.__parent_ = &c;
         g.__is_black_ = true;
-    
+
         std::__tree_balance_after_insert(root.__left_, &c);
-    
+
         assert(std::__tree_invariant(root.__left_));
 
         assert(root.__left_ == &b);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == &f);
         assert(c.__right_ == &g);
         assert(c.__is_black_ == false);
-    
+
         assert(a.__parent_ == &b);
         assert(a.__left_ == &d);
         assert(a.__right_ == &e);
diff --git a/test/containers/associative/tree_remove.pass.cpp b/test/containers/associative/tree_remove.pass.cpp
index e942efca1..55a068a64 100644
--- a/test/containers/associative/tree_remove.pass.cpp
+++ b/test/containers/associative/tree_remove.pass.cpp
@@ -39,57 +39,57 @@ test1()
         Node d;
         Node e;
         Node y;
-    
+
         root.__left_ = &b;
-    
+
         b.__parent_ = &root;
         b.__left_ = &y;
         b.__right_ = &d;
         b.__is_black_ = true;
-    
+
         y.__parent_ = &b;
         y.__left_ = 0;
         y.__right_ = 0;
         y.__is_black_ = true;
-    
+
         d.__parent_ = &b;
         d.__left_ = &c;
         d.__right_ = &e;
         d.__is_black_ = false;
-    
+
         c.__parent_ = &d;
         c.__left_ = 0;
         c.__right_ = 0;
         c.__is_black_ = true;
-    
+
         e.__parent_ = &d;
         e.__left_ = 0;
         e.__right_ = 0;
         e.__is_black_ = true;
-    
+
         std::__tree_remove(root.__left_, &y);
         assert(std::__tree_invariant(root.__left_));
-    
+
         assert(root.__parent_ == 0);
         assert(root.__left_ == &d);
         assert(root.__right_ == 0);
         assert(root.__is_black_ == false);
-    
+
         assert(d.__parent_ == &root);
         assert(d.__left_ == &b);
         assert(d.__right_ == &e);
         assert(d.__is_black_ == true);
-    
+
         assert(b.__parent_ == &d);
         assert(b.__left_ == 0);
         assert(b.__right_ == &c);
         assert(b.__is_black_ == true);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(e.__parent_ == &d);
         assert(e.__left_ == 0);
         assert(e.__right_ == 0);
@@ -104,57 +104,57 @@ test1()
         Node d;
         Node e;
         Node y;
-    
+
         root.__left_ = &b;
-    
+
         b.__parent_ = &root;
         b.__right_ = &y;
         b.__left_ = &d;
         b.__is_black_ = true;
-    
+
         y.__parent_ = &b;
         y.__right_ = 0;
         y.__left_ = 0;
         y.__is_black_ = true;
-    
+
         d.__parent_ = &b;
         d.__right_ = &c;
         d.__left_ = &e;
         d.__is_black_ = false;
-    
+
         c.__parent_ = &d;
         c.__right_ = 0;
         c.__left_ = 0;
         c.__is_black_ = true;
-    
+
         e.__parent_ = &d;
         e.__right_ = 0;
         e.__left_ = 0;
         e.__is_black_ = true;
-    
+
         std::__tree_remove(root.__left_, &y);
         assert(std::__tree_invariant(root.__left_));
-    
+
         assert(root.__parent_ == 0);
         assert(root.__left_ == &d);
         assert(root.__right_ == 0);
         assert(root.__is_black_ == false);
-    
+
         assert(d.__parent_ == &root);
         assert(d.__right_ == &b);
         assert(d.__left_ == &e);
         assert(d.__is_black_ == true);
-    
+
         assert(b.__parent_ == &d);
         assert(b.__right_ == 0);
         assert(b.__left_ == &c);
         assert(b.__is_black_ == true);
-    
+
         assert(c.__parent_ == &b);
         assert(c.__right_ == 0);
         assert(c.__left_ == 0);
         assert(c.__is_black_ == false);
-    
+
         assert(e.__parent_ == &d);
         assert(e.__right_ == 0);
         assert(e.__left_ == 0);
@@ -170,67 +170,67 @@ test1()
         Node e;
         Node f;
         Node y;
-    
+
         root.__left_ = &b;
-    
+
         b.__parent_ = &root;
         b.__left_ = &y;
         b.__right_ = &d;
         b.__is_black_ = true;
-    
+
         y.__parent_ = &b;
         y.__left_ = 0;
         y.__right_ = 0;
         y.__is_black_ = true;
-    
+
         d.__parent_ = &b;
         d.__left_ = &c;
         d.__right_ = &e;
         d.__is_black_ = false;
-    
+
         c.__parent_ = &d;
         c.__left_ = &f;
         c.__right_ = 0;
         c.__is_black_ = true;
-    
+
         e.__parent_ = &d;
         e.__left_ = 0;
         e.__right_ = 0;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &c;
         f.__left_ = 0;
         f.__right_ = 0;
         f.__is_black_ = false;
-    
+
         std::__tree_remove(root.__left_, &y);
         assert(std::__tree_invariant(root.__left_));
-    
+
         assert(root.__parent_ == 0);
         assert(root.__left_ == &d);
         assert(root.__right_ == 0);
         assert(root.__is_black_ == false);
-    
+
         assert(d.__parent_ == &root);
         assert(d.__left_ == &f);
         assert(d.__right_ == &e);
         assert(d.__is_black_ == true);
-    
+
         assert(f.__parent_ == &d);
         assert(f.__left_ == &b);
         assert(f.__right_ == &c);
         assert(f.__is_black_ == false);
-    
+
         assert(b.__parent_ == &f);
         assert(b.__left_ == 0);
         assert(b.__right_ == 0);
         assert(b.__is_black_ == true);
-    
+
         assert(c.__parent_ == &f);
         assert(c.__left_ == 0);
         assert(c.__right_ == 0);
         assert(c.__is_black_ == true);
-    
+
         assert(e.__parent_ == &d);
         assert(e.__left_ == 0);
         assert(e.__right_ == 0);
@@ -246,67 +246,67 @@ test1()
         Node e;
         Node f;
         Node y;
-    
+
         root.__left_ = &b;
-    
+
         b.__parent_ = &root;
         b.__right_ = &y;
         b.__left_ = &d;
         b.__is_black_ = true;
-    
+
         y.__parent_ = &b;
         y.__right_ = 0;
         y.__left_ = 0;
         y.__is_black_ = true;
-    
+
         d.__parent_ = &b;
         d.__right_ = &c;
         d.__left_ = &e;
         d.__is_black_ = false;
-    
+
         c.__parent_ = &d;
         c.__right_ = &f;
         c.__left_ = 0;
         c.__is_black_ = true;
-    
+
         e.__parent_ = &d;
         e.__right_ = 0;
         e.__left_ = 0;
         e.__is_black_ = true;
-    
+
         f.__parent_ = &c;
         f.__right_ = 0;
         f.__left_ = 0;
         f.__is_black_ = false;
-    
+
         std::__tree_remove(root.__left_, &y);
         assert(std::__tree_invariant(root.__left_));
-    
+
         assert(root.__parent_ == 0);
         assert(root.__left_ == &d);
         assert(root.__right_ == 0);
         assert(root.__is_black_ == false);
-    
+
         assert(d.__parent_ == &root);
         assert(d.__right_ == &f);
         assert(d.__left_ == &e);
         assert(d.__is_black_ == true);
-    
+
         assert(f.__parent_ == &d);
         assert(f.__right_ == &b);
         assert(f.__left_ == &c);
         assert(f.__is_black_ == false);
-    
+
         assert(b.__parent_ == &f);
         assert(b.__right_ == 0);
         assert(b.__left_ == 0);
         assert(b.__is_black_ == true);
-    
+
         assert(c.__parent_ == &f);
         assert(c.__right_ == 0);
         assert(c.__left_ == 0);
         assert(c.__is_black_ == true);
-    
+
         assert(e.__parent_ == &d);
         assert(e.__right_ == 0);
         assert(e.__left_ == 0);
diff --git a/test/containers/iterators.h b/test/containers/iterators.h
index 85332ac72..bbdeede9f 100644
--- a/test/containers/iterators.h
+++ b/test/containers/iterators.h
@@ -248,4 +248,4 @@ operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y
     return x.base() - y.base();
 }
 
-#endif
+#endif  // ITERATORS_H
diff --git a/test/containers/sequences/array/types.pass.cpp b/test/containers/sequences/array/types.pass.cpp
index 71bc7e2f0..f1595231e 100644
--- a/test/containers/sequences/array/types.pass.cpp
+++ b/test/containers/sequences/array/types.pass.cpp
@@ -9,21 +9,21 @@
 
 // <array>
 
-// template <class T, size_t N > 
+// template <class T, size_t N >
 // struct array
-// { 
-//     // types: 
-//     typedef T& reference; 
-//     typedef const T& const_reference; 
-//     typedef implementation defined iterator; 
-//     typedef implementation defined const_iterator; 
-//     typedef T value_type; 
+// {
+//     // types:
+//     typedef T& reference;
+//     typedef const T& const_reference;
+//     typedef implementation defined iterator;
+//     typedef implementation defined const_iterator;
+//     typedef T value_type;
 //     typedef T* pointer;
-//     typedef size_t size_type; 
-//     typedef ptrdiff_t difference_type; 
-//     typedef T value_type; 
-//     typedef std::reverse_iterator<iterator> reverse_iterator; 
-//     typedef std::reverse_iterator<const_iterator> const_reverse_iterator; 
+//     typedef size_t size_type;
+//     typedef ptrdiff_t difference_type;
+//     typedef T value_type;
+//     typedef std::reverse_iterator<iterator> reverse_iterator;
+//     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
 #include <array>
 #include <iterator>
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
index faedbc86a..149d48c3a 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
@@ -34,7 +34,7 @@ struct test
     test(const value_compare& comp, container_type&& c,
          const test_allocator<int>& a) : base(comp, std::move(c), a) {}
     test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
-#endif
+#endif  // _LIBCPP_MOVE
     test_allocator<int> get_allocator() {return c.get_allocator();}
 
     using base::c;
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
index ca8c4cb6d..e0ee5cd39 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
@@ -34,7 +34,7 @@ struct test
     test(const value_compare& comp, container_type&& c,
          const test_allocator<int>& a) : base(comp, std::move(c), a) {}
     test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
-#endif
+#endif  // _LIBCPP_MOVE
     test_allocator<int> get_allocator() {return c.get_allocator();}
 
     using base::c;
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
index daf3ed0a1..473e291b0 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
@@ -45,7 +45,7 @@ struct test
     test(const value_compare& comp, container_type&& c,
          const test_allocator<int>& a) : base(comp, std::move(c), a) {}
     test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
-#endif
+#endif  // _LIBCPP_MOVE
     test_allocator<int> get_allocator() {return c.get_allocator();}
 
     using base::c;
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
index 011acf0b6..ec6b2befb 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
@@ -45,7 +45,7 @@ struct test
     test(const value_compare& comp, container_type&& c,
          const test_allocator<int>& a) : base(comp, std::move(c), a) {}
     test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
-#endif
+#endif  // _LIBCPP_MOVE
     test_allocator<int> get_allocator() {return c.get_allocator();}
 
     using base::c;
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
index 1ac5f576a..757f1e3ef 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
@@ -52,7 +52,7 @@ struct test
     using base::c;
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -64,5 +64,5 @@ int main()
     assert(q.size() == 5);
     assert(q.c.get_allocator() == test_allocator<MoveOnly>(6));
     assert(q.top() == MoveOnly(4));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
index 160c96fe5..7d0a6848d 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
@@ -28,7 +28,7 @@ make(int n)
     return c;
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -38,5 +38,5 @@ int main()
     q = std::move(qo);
     assert(q.size() == 5);
     assert(q.top() == MoveOnly(4));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
index bfade907e..52b264204 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
@@ -28,7 +28,7 @@ make(int n)
     return c;
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -36,5 +36,5 @@ int main()
     std::priority_queue<MoveOnly> q(std::less<MoveOnly>(), make<std::vector<MoveOnly> >(5));
     assert(q.size() == 5);
     assert(q.top() == MoveOnly(4));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
index 23e071b6b..98da133a8 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
@@ -28,5 +28,5 @@ int main()
                                     std::vector<MoveOnly>(a, a+n/2));
     assert(q.size() == n);
     assert(q.top() == MoveOnly(8));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
index ac4e86072..e1fcf2286 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
@@ -28,7 +28,7 @@ make(int n)
     return c;
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -37,5 +37,5 @@ int main()
     std::priority_queue<MoveOnly> q = std::move(qo);
     assert(q.size() == 5);
     assert(q.top() == MoveOnly(4));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp
index 752046dee..e4b352142 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp
@@ -28,5 +28,5 @@ int main()
     assert(q.top() == Emplaceable(3, 4.5));
     q.emplace(2, 3.5);
     assert(q.top() == Emplaceable(3, 4.5));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/empty.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/empty.pass.cpp
index 48e873015..891e7c2eb 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/empty.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/empty.pass.cpp
@@ -13,7 +13,6 @@
 
 // bool empty() const;
 
-
 #include <queue>
 #include <cassert>
 
diff --git a/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
index fbc96b065..032766bba 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
@@ -28,5 +28,5 @@ int main()
     assert(q.top() == 3);
     q.push(2);
     assert(q.top() == 3);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/priority.queue/types.pass.cpp b/test/containers/sequences/container.adaptors/priority.queue/types.pass.cpp
index e732222b3..d68c0563a 100644
--- a/test/containers/sequences/container.adaptors/priority.queue/types.pass.cpp
+++ b/test/containers/sequences/container.adaptors/priority.queue/types.pass.cpp
@@ -19,7 +19,7 @@
 //     typedef typename container_type::reference       reference;
 //     typedef typename container_type::const_reference const_reference;
 //     typedef typename container_type::size_type       size_type;
-// 
+//
 // protected:
 //     container_type c;
 //     Compare comp;
diff --git a/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
index a98986908..122732b28 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
@@ -27,7 +27,7 @@ struct test
 #ifdef _LIBCPP_MOVE
     test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {}
     test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
-#endif
+#endif  // _LIBCPP_MOVE
     test_allocator<int> get_allocator() {return c.get_allocator();}
 };
 
diff --git a/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
index 67db45780..711aa918f 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
@@ -39,7 +39,7 @@ struct test
 #ifdef _LIBCPP_MOVE
     test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {}
     test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
-#endif
+#endif  // _LIBCPP_MOVE
     test_allocator<int> get_allocator() {return c.get_allocator();}
 };
 
diff --git a/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
index 09b751b17..ee5950eb0 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
@@ -47,7 +47,7 @@ struct test
     allocator_type get_allocator() {return this->c.get_allocator();}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -55,5 +55,5 @@ int main()
     test<MoveOnly> q(make<C>(5), test_allocator<MoveOnly>(4));
     assert(q.get_allocator() == test_allocator<MoveOnly>(4));
     assert(q.size() == 5);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
index ef80e1542..47250b3f1 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
@@ -47,7 +47,7 @@ struct test
     allocator_type get_allocator() {return this->c.get_allocator();}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -56,5 +56,5 @@ int main()
     test<MoveOnly> q2(std::move(q), test_allocator<MoveOnly>(5));
     assert(q2.get_allocator() == test_allocator<MoveOnly>(5));
     assert(q2.size() == 5);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/queue/queue.cons/ctor_move.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
index 77afd58c2..4ffaaf68f 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
@@ -28,7 +28,7 @@ make(int n)
     return c;
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -37,5 +37,5 @@ int main()
     std::queue<MoveOnly> q2 = std::move(q);
     assert(q2.size() == 5);
     assert(q.empty());
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
index 1bdba11b8..cade12568 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
@@ -28,12 +28,12 @@ make(int n)
     return c;
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
 #ifdef _LIBCPP_MOVE
     std::queue<MoveOnly> q(make<std::deque<MoveOnly> >(5));
     assert(q.size() == 5);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/queue/queue.defn/assign_move.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.defn/assign_move.pass.cpp
index fd98b2754..71a689cc2 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.defn/assign_move.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.defn/assign_move.pass.cpp
@@ -28,7 +28,7 @@ make(int n)
     return c;
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -38,5 +38,5 @@ int main()
     q2 = std::move(q);
     assert(q2.size() == 5);
     assert(q.empty());
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/queue/queue.defn/emplace.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.defn/emplace.pass.cpp
index 0d6451caf..a54172f68 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.defn/emplace.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.defn/emplace.pass.cpp
@@ -26,5 +26,5 @@ int main()
     assert(q.size() == 3);
     assert(q.front() == Emplaceable(1, 2.5));
     assert(q.back() == Emplaceable(3, 4.5));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/queue/queue.defn/push_rv.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.defn/push_rv.pass.cpp
index bc6bce0a0..4bc35ab6e 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.defn/push_rv.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.defn/push_rv.pass.cpp
@@ -32,5 +32,5 @@ int main()
     assert(q.size() == 3);
     assert(q.front() == MoveOnly(1));
     assert(q.back() == MoveOnly(3));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/queue/queue.defn/types.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.defn/types.pass.cpp
index 28d64b2a3..2c00b1f86 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.defn/types.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.defn/types.pass.cpp
@@ -18,7 +18,7 @@
 //     typedef typename container_type::reference       reference;
 //     typedef typename container_type::const_reference const_reference;
 //     typedef typename container_type::size_type       size_type;
-// 
+//
 // protected:
 //     container_type c;
 // ...
diff --git a/test/containers/sequences/container.adaptors/queue/queue.ops/eq.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.ops/eq.pass.cpp
index 176f89d18..0c3c1f86d 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.ops/eq.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.ops/eq.pass.cpp
@@ -11,7 +11,7 @@
 
 // template <class T, class Container>
 //   bool operator==(const queue<T, Container>& x,const queue<T, Container>& y);
-// 
+//
 // template <class T, class Container>
 //   bool operator!=(const queue<T, Container>& x,const queue<T, Container>& y);
 
diff --git a/test/containers/sequences/container.adaptors/queue/queue.ops/lt.pass.cpp b/test/containers/sequences/container.adaptors/queue/queue.ops/lt.pass.cpp
index c99ccc1a3..a139c2868 100644
--- a/test/containers/sequences/container.adaptors/queue/queue.ops/lt.pass.cpp
+++ b/test/containers/sequences/container.adaptors/queue/queue.ops/lt.pass.cpp
@@ -11,13 +11,13 @@
 
 // template <class T, class Container>
 //   bool operator< (const queue<T, Container>& x,const queue<T, Container>& y);
-// 
+//
 // template <class T, class Container>
 //   bool operator> (const queue<T, Container>& x,const queue<T, Container>& y);
-// 
+//
 // template <class T, class Container>
 //   bool operator>=(const queue<T, Container>& x,const queue<T, Container>& y);
-// 
+//
 // template <class T, class Container>
 //   bool operator<=(const queue<T, Container>& x,const queue<T, Container>& y);
 
diff --git a/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
index bc1886083..1e3f5ce2e 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
@@ -27,7 +27,7 @@ struct test
 #ifdef _LIBCPP_MOVE
     test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {}
     test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
-#endif
+#endif  // _LIBCPP_MOVE
     test_allocator<int> get_allocator() {return c.get_allocator();}
 };
 
diff --git a/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
index c714aeb0f..9cdffac8f 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
@@ -39,7 +39,7 @@ struct test
 #ifdef _LIBCPP_MOVE
     test(container_type&& c, const test_allocator<int>& a) : base(std::move(c), a) {}
     test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
-#endif
+#endif  // _LIBCPP_MOVE
     test_allocator<int> get_allocator() {return c.get_allocator();}
 };
 
diff --git a/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
index a1dbc404d..2c5c5f975 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
@@ -47,7 +47,7 @@ struct test
     allocator_type get_allocator() {return this->c.get_allocator();}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -55,5 +55,5 @@ int main()
     test<MoveOnly> q(make<C>(5), test_allocator<MoveOnly>(4));
     assert(q.get_allocator() == test_allocator<MoveOnly>(4));
     assert(q.size() == 5);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
index c3419f0dc..8af2510c6 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
@@ -47,7 +47,7 @@ struct test
     allocator_type get_allocator() {return this->c.get_allocator();}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -56,5 +56,5 @@ int main()
     test<MoveOnly> q2(std::move(q), test_allocator<MoveOnly>(5));
     assert(q2.get_allocator() == test_allocator<MoveOnly>(5));
     assert(q2.size() == 5);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/stack/stack.cons/ctor_move.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
index d1f848728..0646d0b20 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
@@ -28,7 +28,7 @@ make(int n)
     return c;
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -37,5 +37,5 @@ int main()
     std::stack<MoveOnly> q2 = std::move(q);
     assert(q2.size() == 5);
     assert(q.empty());
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
index 4085547f7..bdb4a353a 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
@@ -28,12 +28,12 @@ make(int n)
     return c;
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
 #ifdef _LIBCPP_MOVE
     std::stack<MoveOnly> q(make<std::deque<MoveOnly> >(5));
     assert(q.size() == 5);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/stack/stack.defn/assign_move.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.defn/assign_move.pass.cpp
index 5b52a97ed..cf4c4522b 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.defn/assign_move.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.defn/assign_move.pass.cpp
@@ -28,7 +28,7 @@ make(int n)
     return c;
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -38,5 +38,5 @@ int main()
     q2 = std::move(q);
     assert(q2.size() == 5);
     assert(q.empty());
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/stack/stack.defn/emplace.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.defn/emplace.pass.cpp
index 23ca6f034..8a47c14ff 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.defn/emplace.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.defn/emplace.pass.cpp
@@ -25,5 +25,5 @@ int main()
     q.emplace(3, 4.5);
     assert(q.size() == 3);
     assert(q.top() == Emplaceable(3, 4.5));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/stack/stack.defn/push_rv.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.defn/push_rv.pass.cpp
index 7e075d8a1..ce2edd34d 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.defn/push_rv.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.defn/push_rv.pass.cpp
@@ -29,5 +29,5 @@ int main()
     q.push(MoveOnly(3));
     assert(q.size() == 3);
     assert(q.top() == MoveOnly(3));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/container.adaptors/stack/stack.defn/types.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.defn/types.pass.cpp
index 9ea307a70..422dd876a 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.defn/types.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.defn/types.pass.cpp
@@ -18,7 +18,7 @@
 //     typedef typename container_type::reference       reference;
 //     typedef typename container_type::const_reference const_reference;
 //     typedef typename container_type::size_type       size_type;
-// 
+//
 // protected:
 //     container_type c;
 // ...
diff --git a/test/containers/sequences/container.adaptors/stack/stack.ops/eq.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.ops/eq.pass.cpp
index 528c2cd10..3c4c6756b 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.ops/eq.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.ops/eq.pass.cpp
@@ -11,7 +11,7 @@
 
 // template <class T, class Container>
 //   bool operator==(const stack<T, Container>& x,const stack<T, Container>& y);
-// 
+//
 // template <class T, class Container>
 //   bool operator!=(const stack<T, Container>& x,const stack<T, Container>& y);
 
diff --git a/test/containers/sequences/container.adaptors/stack/stack.ops/lt.pass.cpp b/test/containers/sequences/container.adaptors/stack/stack.ops/lt.pass.cpp
index 0a73d28f2..563d4d057 100644
--- a/test/containers/sequences/container.adaptors/stack/stack.ops/lt.pass.cpp
+++ b/test/containers/sequences/container.adaptors/stack/stack.ops/lt.pass.cpp
@@ -11,13 +11,13 @@
 
 // template <class T, class Container>
 //   bool operator< (const stack<T, Container>& x,const stack<T, Container>& y);
-// 
+//
 // template <class T, class Container>
 //   bool operator> (const stack<T, Container>& x,const stack<T, Container>& y);
-// 
+//
 // template <class T, class Container>
 //   bool operator>=(const stack<T, Container>& x,const stack<T, Container>& y);
-// 
+//
 // template <class T, class Container>
 //   bool operator<=(const stack<T, Container>& x,const stack<T, Container>& y);
 
diff --git a/test/containers/sequences/deque/deque.capacity/access.pass.cpp b/test/containers/sequences/deque/deque.capacity/access.pass.cpp
index f71347534..0eada5134 100644
--- a/test/containers/sequences/deque/deque.capacity/access.pass.cpp
+++ b/test/containers/sequences/deque/deque.capacity/access.pass.cpp
@@ -11,13 +11,13 @@
 
 //       reference operator[](size_type __i);
 // const_reference operator[](size_type __i) const;
-// 
+//
 //       reference at(size_type __i);
 // const_reference at(size_type __i) const;
-// 
+//
 //       reference front();
 // const_reference front() const;
-// 
+//
 //       reference back();
 // const_reference back() const;
 
diff --git a/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp b/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
index fa055d6be..41de880e9 100644
--- a/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
@@ -24,5 +24,5 @@ int main()
     assert(d[1] == 4);
     assert(d[2] == 5);
     assert(d[3] == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.cons/copy.pass.cpp b/test/containers/sequences/deque/deque.cons/copy.pass.cpp
index d1ed4dd2b..5f7bff4f9 100644
--- a/test/containers/sequences/deque/deque.cons/copy.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/copy.pass.cpp
@@ -43,5 +43,5 @@ int main()
         assert(v2 == v);
         assert(v2.get_allocator() == other_allocator<int>(-2));
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp b/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
index 77fe4075d..e50bf1551 100644
--- a/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
@@ -23,5 +23,5 @@ int main()
     assert(d[1] == 4);
     assert(d[2] == 5);
     assert(d[3] == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
index 485f44384..b532de80f 100644
--- a/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
@@ -26,5 +26,5 @@ int main()
     assert(d[1] == 4);
     assert(d[2] == 5);
     assert(d[3] == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.cons/move.pass.cpp b/test/containers/sequences/deque/deque.cons/move.pass.cpp
index 6f3573050..29370f97f 100644
--- a/test/containers/sequences/deque/deque.cons/move.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/move.pass.cpp
@@ -50,5 +50,5 @@ int main()
         assert(c1.size() == 0);
         assert(c3.get_allocator() == c1.get_allocator());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp b/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
index 912b5b8cc..e4b5bb20c 100644
--- a/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
@@ -65,5 +65,5 @@ int main()
         assert(c3.get_allocator() == A(3));
         assert(c1.size() != 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp b/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
index fa5113d5d..bac22eccc 100644
--- a/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
@@ -68,5 +68,5 @@ int main()
         assert(c1.size() == 0);
         assert(c3.get_allocator() == A(5));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp b/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
index 7d29ba56d..ff5d0c6f1 100644
--- a/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
@@ -24,5 +24,5 @@ int main()
     assert(d[1] == 4);
     assert(d[2] == 5);
     assert(d[3] == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.cons/size.pass.cpp b/test/containers/sequences/deque/deque.cons/size.pass.cpp
index 14425b08e..4322584c3 100644
--- a/test/containers/sequences/deque/deque.cons/size.pass.cpp
+++ b/test/containers/sequences/deque/deque.cons/size.pass.cpp
@@ -32,7 +32,7 @@ test(unsigned n)
 #ifdef _LIBCPP_MOVE
     for (const_iterator i = d.begin(), e = d.end(); i != e; ++i)
         assert(*i == T());
-#endif
+#endif  // _LIBCPP_MOVE
     }
     assert(DefaultOnly::count == 0);
 }
diff --git a/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp b/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
index 3b56edc82..15257e78d 100644
--- a/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
+++ b/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
@@ -85,7 +85,7 @@ testN(int start, int N)
     }
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -95,5 +95,5 @@ int main()
     for (int i = 0; i < N; ++i)
         for (int j = 0; j < N; ++j)
             testN(rng[i], rng[j]);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp b/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
index fd90edd0c..a08cc9522 100644
--- a/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
+++ b/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
@@ -60,7 +60,7 @@ testN(int start, int N)
     test(c1);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -70,5 +70,5 @@ int main()
     for (int i = 0; i < N; ++i)
         for (int j = 0; j < N; ++j)
             testN(rng[i], rng[j]);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp b/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
index c6848082c..bf7e802b4 100644
--- a/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
+++ b/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
@@ -60,7 +60,7 @@ testN(int start, int N)
     test(c1);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -70,5 +70,5 @@ int main()
     for (int i = 0; i < N; ++i)
         for (int j = 0; j < N; ++j)
             testN(rng[i], rng[j]);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp b/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp
index 11f3648f1..cd050319c 100644
--- a/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp
+++ b/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp
@@ -35,5 +35,5 @@ int main()
     assert(d[11] == 1);
     assert(d[12] == 1);
     assert(d[13] == 1);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp b/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
index 99bdf4a5b..01936a45e 100644
--- a/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
+++ b/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
@@ -219,10 +219,9 @@ test_move()
     j = 0;
     for (CI i = c.begin(); i != c.end(); ++i, ++j)
         assert(*i == MoveOnly(j));
-#endif
+#endif  // _LIBCPP_MOVE
 }
 
-
 int main()
 {
     int rng[] = {0, 1, 2, 3, 1023, 1024, 1025, 2047, 2048, 2049};
diff --git a/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp b/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
index f7d51af09..95f4bb413 100644
--- a/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
+++ b/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
@@ -91,7 +91,7 @@ testN(int start, int N)
     }
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -101,5 +101,5 @@ int main()
     for (int i = 0; i < N; ++i)
         for (int j = 0; j < N; ++j)
             testN(rng[i], rng[j]);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp b/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
index aedf572d0..51c4c8142 100644
--- a/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
+++ b/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
@@ -54,7 +54,7 @@ void test(int size)
     }
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -63,5 +63,5 @@ int main()
     const int N = sizeof(rng)/sizeof(rng[0]);
     for (int j = 0; j < N; ++j)
         test(rng[j]);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp b/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
index 49a22d484..768f721e3 100644
--- a/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
+++ b/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
@@ -63,7 +63,7 @@ testN(int start, int N)
     test(c1, -10);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -73,5 +73,5 @@ int main()
     for (int i = 0; i < N; ++i)
         for (int j = 0; j < N; ++j)
             testN(rng[i], rng[j]);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/deque/types.pass.cpp b/test/containers/sequences/deque/types.pass.cpp
index 6f94e3d4e..76a980be5 100644
--- a/test/containers/sequences/deque/types.pass.cpp
+++ b/test/containers/sequences/deque/types.pass.cpp
@@ -11,11 +11,11 @@
 
 // Test nested types and default template args:
 
-// template <class T, class Allocator = allocator<T> > 
+// template <class T, class Allocator = allocator<T> >
 // class deque
-// { 
-// public: 
-//     typedef T                                        value_type; 
+// {
+// public:
+//     typedef T                                        value_type;
 //     typedef Allocator                                allocator_type;
 //     typedef typename allocator_type::reference       reference;
 //     typedef typename allocator_type::const_reference const_reference;
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
index bbcd74839..ce1c6760e 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
@@ -40,5 +40,5 @@ int main()
             assert(*i == 10+n);
         assert(n == 4);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
index 1efa7605a..2b3a2b1fe 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
@@ -158,5 +158,5 @@ int main()
         assert(c1.get_allocator() == A(10));
         assert(c0.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
index 0f384cf64..0fe1ab49d 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
@@ -40,5 +40,5 @@ int main()
             assert(*i == 10+n);
         assert(n == 4);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
index ca0716f97..c7de3dfcd 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
@@ -15,7 +15,6 @@
 #include <cassert>
 #include <iterator>
 
-
 int main()
 {
     {
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
index e28403c7a..8533c8f38 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
@@ -48,5 +48,5 @@ int main()
         assert(c == c0);
         assert(c.get_allocator() == A(-2));
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
index ab8b81499..8ea773f29 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
@@ -26,5 +26,5 @@ int main()
             assert(*i == n);
         assert(n == 10);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
index 0427ca112..be41b88e8 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
@@ -30,5 +30,5 @@ int main()
         assert(n == 10);
         assert(c.get_allocator() == A(14));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
index ec7a31235..4d920971d 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
@@ -51,5 +51,5 @@ int main()
         assert(c0.empty());
         assert(c.get_allocator() == A(10));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
index 1411d4df4..7be1b320f 100644
--- a/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
@@ -51,5 +51,5 @@ int main()
         assert(!c0.empty());
         assert(c.get_allocator() == A(9));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
index cdbc12ea6..492b1b973 100644
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
@@ -51,5 +51,5 @@ int main()
         assert(*next(c.begin(), 3) == Emplaceable(2, 3.5));
         assert(distance(c.begin(), c.end()) == 4);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
index 82e6aa1dc..adf614d8c 100644
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
@@ -31,5 +31,5 @@ int main()
         assert(*next(c.begin()) == Emplaceable());
         assert(distance(c.begin(), c.end()) == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
index cd84e6855..08f1e69b4 100644
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
@@ -14,7 +14,6 @@
 #include <forward_list>
 #include <cassert>
 
-
 int main()
 {
     {
diff --git a/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
index 211197f04..83bfdadac 100644
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
@@ -42,5 +42,5 @@ int main()
         assert(*next(c.begin(), 3) == 1);
         assert(*next(c.begin(), 4) == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
index 3a4caa4c3..0809dd1de 100644
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
@@ -51,5 +51,5 @@ int main()
         assert(*next(c.begin(), 3) == 2);
         assert(distance(c.begin(), c.end()) == 4);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
index 89e4c7361..d7ed15260 100644
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
@@ -14,7 +14,6 @@
 #include <forward_list>
 #include <cassert>
 
-
 int main()
 {
     {
diff --git a/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
index c4fb51219..2891b760b 100644
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
@@ -44,5 +44,5 @@ int main()
         c.pop_front();
         assert(distance(c.begin(), c.end()) == 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
index aabbc98e3..17d0e712f 100644
--- a/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
@@ -31,5 +31,5 @@ int main()
         assert(*next(c.begin()) == 1);
         assert(distance(c.begin(), c.end()) == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
index f5b3d2fd0..2f3db020f 100644
--- a/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
@@ -45,7 +45,7 @@ int main()
         {
             C c1(std::begin(t1), std::end(t1));
             C c2(t2, t2+l);
-    
+
             c1.splice_after(next(c1.cbefore_begin(), p), std::move(c2));
             testd(c1, p, l);
         }
diff --git a/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp
index 8638cde65..4525124c1 100644
--- a/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp
@@ -81,7 +81,7 @@ int main()
         {
             C c1(std::begin(t1), std::end(t1));
             C c2(std::begin(t2), std::end(t2));
-    
+
             c1.splice_after(next(c1.cbefore_begin(), p), std::move(c2),
                   next(c2.cbefore_begin(), f));
             testd(c1, p, f);
@@ -94,7 +94,7 @@ int main()
         for (int p = 0; p <= size_t1; ++p)
         {
             C c1(std::begin(t1), std::end(t1));
-    
+
             c1.splice_after(next(c1.cbefore_begin(), p), std::move(c1),
                   next(c1.cbefore_begin(), f));
             tests(c1, p, f);
diff --git a/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
index e21d0151f..ce54c63b1 100644
--- a/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
@@ -84,7 +84,7 @@ int main()
             {
                 C c1(std::begin(t1), std::end(t1));
                 C c2(std::begin(t2), std::end(t2));
-        
+
                 c1.splice_after(next(c1.cbefore_begin(), p), std::move(c2),
                       next(c2.cbefore_begin(), f), next(c2.cbefore_begin(), l));
                 testd(c1, p, f, l);
@@ -100,7 +100,7 @@ int main()
             for (int p = 0; p <= f; ++p)
             {
                 C c1(std::begin(t1), std::end(t1));
-        
+
                 c1.splice_after(next(c1.cbefore_begin(), p), std::move(c1),
                       next(c1.cbefore_begin(), f), next(c1.cbefore_begin(), l));
                 tests(c1, p, f, l);
@@ -108,7 +108,7 @@ int main()
             for (int p = l; p <= size_t1; ++p)
             {
                 C c1(std::begin(t1), std::end(t1));
-        
+
                 c1.splice_after(next(c1.cbefore_begin(), p), std::move(c1),
                       next(c1.cbefore_begin(), f), next(c1.cbefore_begin(), l));
                 tests(c1, p, f, l);
diff --git a/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp
index 0022066f2..66c568c34 100644
--- a/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp
@@ -12,7 +12,7 @@
 // template <class T, class Allocator>
 //     bool operator==(const forward_list<T, Allocator>& x,
 //                     const forward_list<T, Allocator>& y);
-// 
+//
 // template <class T, class Allocator>
 //     bool operator!=(const forward_list<T, Allocator>& x,
 //                     const forward_list<T, Allocator>& y);
diff --git a/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp
index 2ab9951dd..6418ceec3 100644
--- a/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp
+++ b/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp
@@ -12,15 +12,15 @@
 // template <class T, class Allocator>
 //     bool operator< (const forward_list<T, Allocator>& x,
 //                     const forward_list<T, Allocator>& y);
-// 
+//
 // template <class T, class Allocator>
 //     bool operator> (const forward_list<T, Allocator>& x,
 //                     const forward_list<T, Allocator>& y);
-// 
+//
 // template <class T, class Allocator>
 //     bool operator>=(const forward_list<T, Allocator>& x,
 //                     const forward_list<T, Allocator>& y);
-// 
+//
 // template <class T, class Allocator>
 //     bool operator<=(const forward_list<T, Allocator>& x,
 //                     const forward_list<T, Allocator>& y);
diff --git a/test/containers/sequences/forwardlist/types.pass.cpp b/test/containers/sequences/forwardlist/types.pass.cpp
index 793ad26c9..dc33b5371 100644
--- a/test/containers/sequences/forwardlist/types.pass.cpp
+++ b/test/containers/sequences/forwardlist/types.pass.cpp
@@ -15,7 +15,7 @@
 // public:
 //   typedef T         value_type;
 //   typedef Allocator allocator_type;
-// 
+//
 //   typedef value_type&                                                reference;
 //   typedef const value_type&                                          const_reference;
 //   typedef typename allocator_traits<allocator_type>::pointer         pointer;
diff --git a/test/containers/sequences/list/list.capacity/resize_size.pass.cpp b/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
index 942b6992b..38262045a 100644
--- a/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
+++ b/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
@@ -45,5 +45,5 @@ int main()
         assert(l.size() == 20);
         assert(std::distance(l.begin(), l.end()) == 20);
     }
-#endif
+#endif  // __LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp b/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
index 2a6cbaee7..fc4a55caf 100644
--- a/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
+++ b/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
@@ -25,5 +25,5 @@ int main()
     assert(*i++ == 4);
     assert(*i++ == 5);
     assert(*i++ == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.cons/assign_move.pass.cpp b/test/containers/sequences/list/list.cons/assign_move.pass.cpp
index a535c8b38..c2ca3fac8 100644
--- a/test/containers/sequences/list/list.cons/assign_move.pass.cpp
+++ b/test/containers/sequences/list/list.cons/assign_move.pass.cpp
@@ -61,5 +61,5 @@ int main()
         assert(l.empty());
         assert(l2.get_allocator() == lo.get_allocator());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.cons/copy.pass.cpp b/test/containers/sequences/list/list.cons/copy.pass.cpp
index 0793831ed..ab31d8e53 100644
--- a/test/containers/sequences/list/list.cons/copy.pass.cpp
+++ b/test/containers/sequences/list/list.cons/copy.pass.cpp
@@ -36,5 +36,5 @@ int main()
         assert(l2 == l);
         assert(l2.get_allocator() == other_allocator<int>(-2));
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/sequences/list/list.cons/initializer_list.pass.cpp b/test/containers/sequences/list/list.cons/initializer_list.pass.cpp
index e83f8b796..8d55299b5 100644
--- a/test/containers/sequences/list/list.cons/initializer_list.pass.cpp
+++ b/test/containers/sequences/list/list.cons/initializer_list.pass.cpp
@@ -24,5 +24,5 @@ int main()
     assert(*i++ == 4);
     assert(*i++ == 5);
     assert(*i++ == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp b/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
index 5d68faf3c..e8a7f84cb 100644
--- a/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
+++ b/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
@@ -27,5 +27,5 @@ int main()
     assert(*i++ == 4);
     assert(*i++ == 5);
     assert(*i++ == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.cons/input_iterator.pass.cpp b/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
index b72188a9c..685077eae 100644
--- a/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
+++ b/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
@@ -9,7 +9,7 @@
 
 // <list>
 
-// template <class InputIterator> 
+// template <class InputIterator>
 //   list(InputIterator first, InputIterator last, const Allocator& = Allocator());
 
 #include <list>
diff --git a/test/containers/sequences/list/list.cons/move.pass.cpp b/test/containers/sequences/list/list.cons/move.pass.cpp
index f2030ea5f..2d331e20d 100644
--- a/test/containers/sequences/list/list.cons/move.pass.cpp
+++ b/test/containers/sequences/list/list.cons/move.pass.cpp
@@ -45,5 +45,5 @@ int main()
         assert(l.empty());
         assert(l2.get_allocator() == lo.get_allocator());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.cons/move_alloc.pass.cpp b/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
index 9488ac0bf..f91f12af7 100644
--- a/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
+++ b/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
@@ -58,5 +58,5 @@ int main()
         assert(!l.empty());
         assert(l2.get_allocator() == other_allocator<MoveOnly>(4));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp b/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
index 98020575d..d3715f3cd 100644
--- a/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
+++ b/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
@@ -25,5 +25,5 @@ int main()
     assert(*i++ == 4);
     assert(*i++ == 5);
     assert(*i++ == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.cons/size_type.pass.cpp b/test/containers/sequences/list/list.cons/size_type.pass.cpp
index 384847441..4d34e23f8 100644
--- a/test/containers/sequences/list/list.cons/size_type.pass.cpp
+++ b/test/containers/sequences/list/list.cons/size_type.pass.cpp
@@ -46,5 +46,5 @@ int main()
         assert(l.size() == 3);
         assert(std::distance(l.begin(), l.end()) == 3);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.modifiers/emplace.pass.cpp b/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
index 2cf74a316..9a5e6e79a 100644
--- a/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
+++ b/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
@@ -43,5 +43,5 @@ int main()
     assert(c.front().getd() == 3.5);
     assert(c.back().geti() == 3);
     assert(c.back().getd() == 4.5);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp b/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
index a87e09e57..baea60e2f 100644
--- a/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
+++ b/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
@@ -43,5 +43,5 @@ int main()
     assert(c.front().getd() == 3.5);
     assert(c.back().geti() == 3);
     assert(c.back().getd() == 4.5);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp b/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
index 0ab22022e..73956ac0e 100644
--- a/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
+++ b/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
@@ -43,5 +43,5 @@ int main()
     assert(c.front().getd() == 4.5);
     assert(c.back().geti() == 2);
     assert(c.back().getd() == 3.5);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp b/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
index 38f2004d7..39b4ee11f 100644
--- a/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
+++ b/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
@@ -36,5 +36,5 @@ int main()
     assert(*i++ == 1);
     assert(*i++ == 1);
     assert(*i++ == 1);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp b/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
index e4a2aae4c..bf19d76a4 100644
--- a/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
+++ b/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
@@ -9,7 +9,7 @@
 
 // <list>
 
-// template <InputIterator Iter> 
+// template <InputIterator Iter>
 //   iterator insert(const_iterator position, Iter first, Iter last);
 
 #include <list>
diff --git a/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp b/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
index 5c1f156e7..5d43bd123 100644
--- a/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
+++ b/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
@@ -27,5 +27,5 @@ int main()
     assert(l1.size() == 2);
     assert(l1.front() == MoveOnly(2));
     assert(l1.back() == MoveOnly(1));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp b/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
index f75da9b9b..0f0160a47 100644
--- a/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
+++ b/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
@@ -27,5 +27,5 @@ int main()
     assert(l1.size() == 2);
     assert(l1.front() == MoveOnly(1));
     assert(l1.back() == MoveOnly(2));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp b/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
index 06ab46a96..b8addaf90 100644
--- a/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
+++ b/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
@@ -27,5 +27,5 @@ int main()
     assert(l1.size() == 2);
     assert(l1.front() == MoveOnly(2));
     assert(l1.back() == MoveOnly(1));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/list/list.special/swap.pass.cpp b/test/containers/sequences/list/list.special/swap.pass.cpp
index f095d68de..5a0a6442d 100644
--- a/test/containers/sequences/list/list.special/swap.pass.cpp
+++ b/test/containers/sequences/list/list.special/swap.pass.cpp
@@ -12,7 +12,6 @@
 // template <class T, class Alloc>
 //   void swap(list<T,Alloc>& x, list<T,Alloc>& y);
 
-
 #include <list>
 #include <cassert>
 #include "../../../test_allocator.h"
diff --git a/test/containers/sequences/list/types.pass.cpp b/test/containers/sequences/list/types.pass.cpp
index aedaa5bf4..d4ad073ed 100644
--- a/test/containers/sequences/list/types.pass.cpp
+++ b/test/containers/sequences/list/types.pass.cpp
@@ -13,7 +13,7 @@
 // class list
 // {
 // public:
-// 
+//
 //     // types:
 //     typedef T value_type;
 //     typedef Alloc allocator_type;
diff --git a/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp b/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
index 93c10f0e6..787cb3f2f 100644
--- a/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
+++ b/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
@@ -24,5 +24,5 @@ int main()
     assert(d[1] == false);
     assert(d[2] == false);
     assert(d[3] == true);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector.bool/assign_move.pass.cpp b/test/containers/sequences/vector.bool/assign_move.pass.cpp
index 46f01da3e..f1461f293 100644
--- a/test/containers/sequences/vector.bool/assign_move.pass.cpp
+++ b/test/containers/sequences/vector.bool/assign_move.pass.cpp
@@ -60,5 +60,5 @@ int main()
         assert(l.empty());
         assert(l2.get_allocator() == lo.get_allocator());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector.bool/copy.pass.cpp b/test/containers/sequences/vector.bool/copy.pass.cpp
index 45c042511..928d9adcf 100644
--- a/test/containers/sequences/vector.bool/copy.pass.cpp
+++ b/test/containers/sequences/vector.bool/copy.pass.cpp
@@ -47,5 +47,5 @@ int main()
         assert(v2 == v);
         assert(v2.get_allocator() == other_allocator<bool>(-2));
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/sequences/vector.bool/initializer_list.pass.cpp b/test/containers/sequences/vector.bool/initializer_list.pass.cpp
index 87d87dd9f..e5e58469b 100644
--- a/test/containers/sequences/vector.bool/initializer_list.pass.cpp
+++ b/test/containers/sequences/vector.bool/initializer_list.pass.cpp
@@ -23,5 +23,5 @@ int main()
     assert(d[1] == false);
     assert(d[2] == false);
     assert(d[3] == true);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp b/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
index b0f10606a..7d493635a 100644
--- a/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
+++ b/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
@@ -26,5 +26,5 @@ int main()
     assert(d[1] == false);
     assert(d[2] == false);
     assert(d[3] == true);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp b/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
index 40c796e5a..c2b314e3a 100644
--- a/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
+++ b/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
@@ -35,5 +35,5 @@ int main()
     assert(d[11] == true);
     assert(d[12] == true);
     assert(d[13] == true);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp b/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
index 790393804..51802e048 100644
--- a/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
+++ b/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
@@ -10,7 +10,7 @@
 // <vector>
 // vector<bool>
 
-// template <class Iter> 
+// template <class Iter>
 //   iterator insert(const_iterator position, Iter first, Iter last);
 
 #include <vector>
diff --git a/test/containers/sequences/vector.bool/move.pass.cpp b/test/containers/sequences/vector.bool/move.pass.cpp
index bf619271b..f2cc56eb6 100644
--- a/test/containers/sequences/vector.bool/move.pass.cpp
+++ b/test/containers/sequences/vector.bool/move.pass.cpp
@@ -44,5 +44,5 @@ int main()
         assert(l.empty());
         assert(l2.get_allocator() == lo.get_allocator());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector.bool/move_alloc.pass.cpp b/test/containers/sequences/vector.bool/move_alloc.pass.cpp
index e98e659d5..b3911b4a2 100644
--- a/test/containers/sequences/vector.bool/move_alloc.pass.cpp
+++ b/test/containers/sequences/vector.bool/move_alloc.pass.cpp
@@ -57,5 +57,5 @@ int main()
         assert(!l.empty());
         assert(l2.get_allocator() == other_allocator<bool>(4));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp b/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
index f132ff9a0..de759e3cb 100644
--- a/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
+++ b/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
@@ -24,5 +24,5 @@ int main()
     assert(d[1] == false);
     assert(d[2] == false);
     assert(d[3] == true);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector.bool/types.pass.cpp b/test/containers/sequences/vector.bool/types.pass.cpp
index 589752f68..f098f5ee7 100644
--- a/test/containers/sequences/vector.bool/types.pass.cpp
+++ b/test/containers/sequences/vector.bool/types.pass.cpp
@@ -11,11 +11,11 @@
 
 // Test nested types and default template args:
 
-// template <class Allocator> 
+// template <class Allocator>
 // class vector<bool, Allocator
-// { 
-// public: 
-//     typedef T                                        value_type; 
+// {
+// public:
+//     typedef T                                        value_type;
 //     typedef Allocator                                allocator_type;
 //     typedef implementation-defined                   iterator;
 //     typedef implementation-defined                   const_iterator;
diff --git a/test/containers/sequences/vector/types.pass.cpp b/test/containers/sequences/vector/types.pass.cpp
index 94cc9bc73..1205763e9 100644
--- a/test/containers/sequences/vector/types.pass.cpp
+++ b/test/containers/sequences/vector/types.pass.cpp
@@ -11,11 +11,11 @@
 
 // Test nested types and default template args:
 
-// template <class T, class Allocator = allocator<T> > 
+// template <class T, class Allocator = allocator<T> >
 // class vector
-// { 
-// public: 
-//     typedef T                                        value_type; 
+// {
+// public:
+//     typedef T                                        value_type;
 //     typedef Allocator                                allocator_type;
 //     typedef typename allocator_type::reference       reference;
 //     typedef typename allocator_type::const_reference const_reference;
diff --git a/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp b/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
index 25e7b9967..8d58f43b6 100644
--- a/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
+++ b/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
@@ -37,7 +37,7 @@ int main()
         assert(v.size() == 200);
         assert(v.capacity() >= 200);
     }
-#else
+#else  // _LIBCPP_MOVE
     {
         std::vector<int> v(100);
         v.resize(50);
@@ -56,5 +56,5 @@ int main()
         assert(v.size() == 200);
         assert(v.capacity() >= 200);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp b/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
index d08386243..80a3c2723 100644
--- a/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
@@ -24,5 +24,5 @@ int main()
     assert(d[1] == 4);
     assert(d[2] == 5);
     assert(d[3] == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp b/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
index 49307059f..38b6d2ec1 100644
--- a/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
@@ -61,5 +61,5 @@ int main()
         assert(l.empty());
         assert(l2.get_allocator() == lo.get_allocator());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp b/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
index 7a2da016a..eb381aebc 100644
--- a/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
@@ -27,7 +27,7 @@ test(typename C::size_type n)
 #ifdef _LIBCPP_MOVE
     for (typename C::const_iterator i = c.cbegin(), e = c.cend(); i != e; ++i)
         assert(*i == typename C::value_type());
-#endif
+#endif  // _LIBCPP_MOVE
 }
 
 int main()
diff --git a/test/containers/sequences/vector/vector.cons/copy.pass.cpp b/test/containers/sequences/vector/vector.cons/copy.pass.cpp
index cd3e4aacf..23e9b8fce 100644
--- a/test/containers/sequences/vector/vector.cons/copy.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/copy.pass.cpp
@@ -46,5 +46,5 @@ int main()
         assert(v2 == v);
         assert(v2.get_allocator() == other_allocator<int>(-2));
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp b/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
index c7e4354aa..243d1f688 100644
--- a/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
@@ -23,5 +23,5 @@ int main()
     assert(d[1] == 4);
     assert(d[2] == 5);
     assert(d[3] == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp b/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
index d9c1e5841..c10d64069 100644
--- a/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
@@ -26,5 +26,5 @@ int main()
     assert(d[1] == 4);
     assert(d[2] == 5);
     assert(d[3] == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.cons/move.pass.cpp b/test/containers/sequences/vector/vector.cons/move.pass.cpp
index 8c1262d0d..13b5efd88 100644
--- a/test/containers/sequences/vector/vector.cons/move.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/move.pass.cpp
@@ -45,5 +45,5 @@ int main()
         assert(l.empty());
         assert(l2.get_allocator() == lo.get_allocator());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp b/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
index 3a7ce7884..1f20666a6 100644
--- a/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
@@ -58,5 +58,5 @@ int main()
         assert(!l.empty());
         assert(l2.get_allocator() == other_allocator<MoveOnly>(4));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp b/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
index 28a0eed96..b20cd192a 100644
--- a/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
+++ b/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
@@ -24,5 +24,5 @@ int main()
     assert(d[1] == 4);
     assert(d[2] == 5);
     assert(d[3] == 6);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp b/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
index 102935963..17c9cf378 100644
--- a/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
+++ b/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
@@ -49,7 +49,7 @@ public:
     double getd() const {return d_;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -102,5 +102,5 @@ int main()
         assert(c.back().geti() == 3);
         assert(c.back().getd() == 4.5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp b/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
index 839ad2781..96adbbdc9 100644
--- a/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
+++ b/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
@@ -49,7 +49,7 @@ public:
     double getd() const {return d_;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -80,5 +80,5 @@ int main()
         assert(c.back().geti() == 3);
         assert(c.back().getd() == 4.5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp b/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
index 6feaafdb1..ad840c55a 100644
--- a/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
+++ b/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
@@ -35,5 +35,5 @@ int main()
     assert(d[11] == 1);
     assert(d[12] == 1);
     assert(d[13] == 1);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp b/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
index 98848e6d7..43f0eceff 100644
--- a/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
+++ b/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
@@ -9,7 +9,7 @@
 
 // <vector>
 
-// template <class Iter> 
+// template <class Iter>
 //   iterator insert(const_iterator position, Iter first, Iter last);
 
 #include <vector>
diff --git a/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp b/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
index ef17f44a1..7612aecd0 100644
--- a/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
+++ b/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
@@ -43,5 +43,5 @@ int main()
         for (++j; j < 101; ++j)
             assert(v[j] == MoveOnly());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp b/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
index ab6925c39..d888e176a 100644
--- a/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
+++ b/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
@@ -65,5 +65,5 @@ int main()
         for (int j = 0; j < c.size(); ++j)
             assert(c[j] == MoveOnly(j));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/sequences/vector/vector.special/swap.pass.cpp b/test/containers/sequences/vector/vector.special/swap.pass.cpp
index d12a432f0..e29f35a73 100644
--- a/test/containers/sequences/vector/vector.special/swap.pass.cpp
+++ b/test/containers/sequences/vector/vector.special/swap.pass.cpp
@@ -12,7 +12,6 @@
 // template <class T, class Alloc>
 //   void swap(vector<T,Alloc>& x, vector<T,Alloc>& y);
 
-
 #include <vector>
 #include <cassert>
 #include "../../../test_allocator.h"
diff --git a/test/containers/stack_allocator.h b/test/containers/stack_allocator.h
index 4d3426b61..30f58718e 100644
--- a/test/containers/stack_allocator.h
+++ b/test/containers/stack_allocator.h
@@ -49,4 +49,4 @@ inline
 void
 swap(stack_allocator<T, N>& x, stack_allocator<T, N>& y) {}
 
-#endif
+#endif  // STACK_ALLOCATOR_H
diff --git a/test/containers/test_allocator.h b/test/containers/test_allocator.h
index 898c0900d..1c0f163d0 100644
--- a/test/containers/test_allocator.h
+++ b/test/containers/test_allocator.h
@@ -62,7 +62,7 @@ public:
 #ifdef _LIBCPP_MOVE
     void construct(pointer p, T&& val)
         {::new(p) T(std::move(val));}
-#endif
+#endif  // _LIBCPP_MOVE
     void destroy(pointer p) {p->~T();}
 
     friend bool operator==(const test_allocator& x, const test_allocator& y)
@@ -105,8 +105,8 @@ public:
 #ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
     std::size_t max_size() const
         {return UINT_MAX / sizeof(T);}
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 
 };
 
-#endif
+#endif  // TEST_ALLOCATOR_H
diff --git a/test/containers/test_compare.h b/test/containers/test_compare.h
index 7153a4cb8..ba562868b 100644
--- a/test/containers/test_compare.h
+++ b/test/containers/test_compare.h
@@ -24,4 +24,4 @@ public:
         {return data_ == c.data_;}
 };
 
-#endif
+#endif  // TEST_COMPARE_H
diff --git a/test/containers/test_hash.h b/test/containers/test_hash.h
index 7bf8cbb74..95f6e9eb1 100644
--- a/test/containers/test_hash.h
+++ b/test/containers/test_hash.h
@@ -20,4 +20,4 @@ public:
         {return data_ == c.data_;}
 };
 
-#endif
+#endif  // TEST_HASH_H
diff --git a/test/containers/unord/unord.map/max_size.pass.cpp b/test/containers/unord/unord.map/max_size.pass.cpp
index a366b2811..75f15b3ed 100644
--- a/test/containers/unord/unord.map/max_size.pass.cpp
+++ b/test/containers/unord/unord.map/max_size.pass.cpp
@@ -18,7 +18,6 @@
 #include <unordered_map>
 #include <cassert>
 
-
 int main()
 {
     {
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp
index 93e9087b8..75577592a 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp
@@ -57,5 +57,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
index ca798182f..b7416f3d2 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
@@ -163,5 +163,5 @@ int main()
         assert(c.max_load_factor() == 1);
         assert(c0.size() == 0);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
index ae230cab3..4b43c2294 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
@@ -104,5 +104,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
index d15fcdfe1..d062c73b4 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
@@ -57,5 +57,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
index 39f875056..410fe3e0e 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
@@ -59,5 +59,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
index 463c30222..2a2c10780 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
@@ -60,5 +60,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
index cf8325f03..35366bd58 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
@@ -62,5 +62,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
index 5bae5de91..b23f0543f 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -63,5 +63,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
index 93e6f9d1f..6d914b30c 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
@@ -103,5 +103,5 @@ int main()
 
         assert(c0.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
index 635a289b1..8074f57d4 100644
--- a/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
@@ -108,5 +108,5 @@ int main()
 
         assert(c0.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp b/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp
index 0a631bc74..1e29014cc 100644
--- a/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp
+++ b/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp
@@ -64,5 +64,5 @@ int main()
         assert(c.size() == 5);
         assert(c.at(11) == "eleven");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp b/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp
index 181c69b3b..268edad8f 100644
--- a/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp
+++ b/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp
@@ -46,5 +46,5 @@ int main()
         assert(r.first->first == 5);
         assert(r.first->second == Emplaceable(6, 7));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp b/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp
index 49e50ef87..c5b43cadf 100644
--- a/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp
+++ b/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp
@@ -44,5 +44,5 @@ int main()
         assert(r->first == 5);
         assert(r->second == Emplaceable(6, 7));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp b/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp
index 91180c8ee..a95549973 100644
--- a/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp
+++ b/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp
@@ -77,5 +77,5 @@ int main()
         assert(r->first == 5);
         assert(r->second == 4);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp b/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
index 09254d507..a06bd676b 100644
--- a/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
+++ b/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
@@ -44,5 +44,5 @@ int main()
         assert(c.at(3) == "three");
         assert(c.at(4) == "four");
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp b/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp
index 05f2f368c..b552e5659 100644
--- a/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp
+++ b/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp
@@ -83,5 +83,5 @@ int main()
         assert(r.first->first == 5);
         assert(r.first->second == 4);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/max_size.pass.cpp b/test/containers/unord/unord.multimap/max_size.pass.cpp
index 5b05f6743..00f153060 100644
--- a/test/containers/unord/unord.multimap/max_size.pass.cpp
+++ b/test/containers/unord/unord.multimap/max_size.pass.cpp
@@ -18,7 +18,6 @@
 #include <unordered_map>
 #include <cassert>
 
-
 int main()
 {
     {
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
index e3d829bac..282c52262 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
@@ -82,5 +82,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
index dd2534fd7..105037f8d 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
@@ -221,5 +221,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
index 55f766f31..5c83b9a43 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
@@ -132,5 +132,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
index ab9ef93dd..69fb04e76 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
@@ -79,5 +79,5 @@ int main()
         assert(c.key_eq() == test_compare<std::equal_to<int> >());
         assert((c.get_allocator() == test_allocator<std::pair<const int, std::string> >()));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
index dd3febc28..192dc3fc7 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
@@ -81,5 +81,5 @@ int main()
         assert(c.key_eq() == test_compare<std::equal_to<int> >());
         assert((c.get_allocator() == test_allocator<std::pair<const int, std::string> >()));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
index 68f656454..7d93d8008 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
@@ -82,5 +82,5 @@ int main()
         assert(c.key_eq() == test_compare<std::equal_to<int> >());
         assert((c.get_allocator() == test_allocator<std::pair<const int, std::string> >()));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
index c5407609f..2e31fe707 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
@@ -84,5 +84,5 @@ int main()
         assert(c.key_eq() == test_compare<std::equal_to<int> >(9));
         assert((c.get_allocator() == test_allocator<std::pair<const int, std::string> >()));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
index f31e72dc3..ef4120803 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -85,5 +85,5 @@ int main()
         assert(c.key_eq() == test_compare<std::equal_to<int> >(9));
         assert((c.get_allocator() == test_allocator<std::pair<const int, std::string> >(10)));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
index eef814bf8..77ab865ec 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
@@ -125,5 +125,5 @@ int main()
 
         assert(c0.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
index 72d975aa9..057b379dc 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
@@ -156,5 +156,5 @@ int main()
 
         assert(c0.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp
index bb0f533f7..b214cc258 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp
@@ -43,5 +43,5 @@ int main()
         assert(r->first == 5);
         assert(r->second == Emplaceable(6, 7));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
index 856b18447..09d36d674 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
@@ -52,5 +52,5 @@ int main()
         assert(r->first == 3);
         assert(r->second == Emplaceable(5, 6));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp
index 39a92babb..063dc6daf 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp
@@ -77,5 +77,5 @@ int main()
         assert(r->first == 5);
         assert(r->second == 4);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
index 43980e697..8da87920a 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
@@ -69,5 +69,5 @@ int main()
         assert(std::distance(c.begin(), c.end()) == c.size());
         assert(std::distance(c.cbegin(), c.cend()) == c.size());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp b/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp
index fd572df11..eaabf2483 100644
--- a/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp
+++ b/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp
@@ -75,5 +75,5 @@ int main()
         assert(r->first == 5);
         assert(r->second == 4);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/emplace.pass.cpp b/test/containers/unord/unord.multiset/emplace.pass.cpp
index f546e1b6a..8fdb176a7 100644
--- a/test/containers/unord/unord.multiset/emplace.pass.cpp
+++ b/test/containers/unord/unord.multiset/emplace.pass.cpp
@@ -40,5 +40,5 @@ int main()
         assert(c.size() == 3);
         assert(*r == Emplaceable(5, 6));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/emplace_hint.pass.cpp b/test/containers/unord/unord.multiset/emplace_hint.pass.cpp
index 996576f63..a5f079c00 100644
--- a/test/containers/unord/unord.multiset/emplace_hint.pass.cpp
+++ b/test/containers/unord/unord.multiset/emplace_hint.pass.cpp
@@ -41,5 +41,5 @@ int main()
         assert(c.size() == 3);
         assert(*r == Emplaceable(5, 6));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp b/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
index e6d248db3..f7db00b19 100644
--- a/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
+++ b/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
@@ -67,5 +67,5 @@ int main()
         assert(c.size() == 4);
         assert(*r == 5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/insert_init.pass.cpp b/test/containers/unord/unord.multiset/insert_init.pass.cpp
index ab8628009..c21df28b8 100644
--- a/test/containers/unord/unord.multiset/insert_init.pass.cpp
+++ b/test/containers/unord/unord.multiset/insert_init.pass.cpp
@@ -43,5 +43,5 @@ int main()
         assert(c.count(3) == 1);
         assert(c.count(4) == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp b/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp
index 4c72c87c2..bfa2f537e 100644
--- a/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp
+++ b/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp
@@ -65,5 +65,5 @@ int main()
         assert(c.size() == 4);
         assert(*r == 5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/max_size.pass.cpp b/test/containers/unord/unord.multiset/max_size.pass.cpp
index 93f401f19..90df14706 100644
--- a/test/containers/unord/unord.multiset/max_size.pass.cpp
+++ b/test/containers/unord/unord.multiset/max_size.pass.cpp
@@ -18,7 +18,6 @@
 #include <unordered_set>
 #include <cassert>
 
-
 int main()
 {
     {
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
index d40e94ce0..1b1d657a9 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
@@ -57,5 +57,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
index bfc191d54..12e147a9b 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
@@ -168,5 +168,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
index ef07af225..764bf2a7a 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
@@ -117,5 +117,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
index 93bdad89b..5578a8448 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
@@ -55,5 +55,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
index 115a15f05..20c80a175 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
@@ -57,5 +57,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
index 1e1477619..452d0b12a 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
@@ -59,5 +59,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
index 9dc23ff78..0b00a0ae7 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
@@ -60,5 +60,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
index 4fec5dec1..b147eab2f 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -61,5 +61,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
index 3e4b2c1e3..5b665a855 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
@@ -100,5 +100,5 @@ int main()
 
         assert(c0.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
index 6f14fba87..064f1caab 100644
--- a/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
+++ b/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
@@ -115,5 +115,5 @@ int main()
 
         assert(c0.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/emplace.pass.cpp b/test/containers/unord/unord.set/emplace.pass.cpp
index bb1593b88..b2ff328b9 100644
--- a/test/containers/unord/unord.set/emplace.pass.cpp
+++ b/test/containers/unord/unord.set/emplace.pass.cpp
@@ -43,5 +43,5 @@ int main()
         assert(*r.first == Emplaceable(5, 6));
         assert(!r.second);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/emplace_hint.pass.cpp b/test/containers/unord/unord.set/emplace_hint.pass.cpp
index 274966910..390885bd8 100644
--- a/test/containers/unord/unord.set/emplace_hint.pass.cpp
+++ b/test/containers/unord/unord.set/emplace_hint.pass.cpp
@@ -41,5 +41,5 @@ int main()
         assert(c.size() == 2);
         assert(*r == Emplaceable(5, 6));
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp b/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
index 548340c02..220634dd9 100644
--- a/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
+++ b/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
@@ -67,5 +67,5 @@ int main()
         assert(c.size() == 3);
         assert(*r == 5);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/insert_init.pass.cpp b/test/containers/unord/unord.set/insert_init.pass.cpp
index 72b4d336a..09093ca55 100644
--- a/test/containers/unord/unord.set/insert_init.pass.cpp
+++ b/test/containers/unord/unord.set/insert_init.pass.cpp
@@ -43,5 +43,5 @@ int main()
         assert(c.count(3) == 1);
         assert(c.count(4) == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/insert_rvalue.pass.cpp b/test/containers/unord/unord.set/insert_rvalue.pass.cpp
index fe04fe1ee..11fa6ef65 100644
--- a/test/containers/unord/unord.set/insert_rvalue.pass.cpp
+++ b/test/containers/unord/unord.set/insert_rvalue.pass.cpp
@@ -73,5 +73,5 @@ int main()
         assert(*r.first == 5);
         assert(r.second);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/max_size.pass.cpp b/test/containers/unord/unord.set/max_size.pass.cpp
index 9b7d2277b..780d7e48f 100644
--- a/test/containers/unord/unord.set/max_size.pass.cpp
+++ b/test/containers/unord/unord.set/max_size.pass.cpp
@@ -18,7 +18,6 @@
 #include <unordered_set>
 #include <cassert>
 
-
 int main()
 {
     {
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
index 6ca9b5a09..9089d41fb 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
@@ -57,5 +57,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
index df55ced66..6fe7c43ba 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
@@ -160,5 +160,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
index 7f7ae7285..f3440d6c0 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
@@ -101,5 +101,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 }
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
index 5e862c78f..e929d6f90 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
@@ -55,5 +55,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
index de709eb10..7523956be 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
@@ -57,5 +57,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
index 8b5a0da3d..b32889b23 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
@@ -59,5 +59,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
index 286acd0be..b1226a192 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
@@ -60,5 +60,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
index baf6d723a..da23591e9 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
@@ -61,5 +61,5 @@ int main()
         assert(c.load_factor() == (float)c.size()/c.bucket_count());
         assert(c.max_load_factor() == 1);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
index c9046daf2..39aa0e59a 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
@@ -100,5 +100,5 @@ int main()
 
         assert(c0.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp b/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
index b1f294d6d..b6b3419e7 100644
--- a/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
+++ b/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
@@ -107,5 +107,5 @@ int main()
 
         assert(c0.empty());
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }