diff --git a/test/containers/Copyable.h b/test/containers/Copyable.h
index 50b3b311..121cef61 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 d40e9c13..bdcf46d1 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 10a660e4..5d457bba 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 b7d62b71..c3468387 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 04177362..57050035 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 80e9390f..ade5b9bf 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 d5f1d04e..4de0889f 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 1673c54c..3a5ffa73 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 d1f92888..6975d607 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 945125c9..3f98368d 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 e56bf849..02ae034a 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 dba0cdcd..d47fb41a 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 fafc80d0..221b2518 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 22a164cc..a36bba4e 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 c235bc01..4ecc434a 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 423f30a2..498c4fa4 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 0535047a..258b87f0 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 6311b883..d4e3676d 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 39cbbe6d..ec1b80b3 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 15753d7e..6e066c5b 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 077d2834..b4a4ee0b 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 a81c3f59..c6844d9c 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 209148cf..948c689f 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 531ef93e..f1b743be 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 57d0ef3d..158accca 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 e24e6018..862487bd 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 0cb785bc..542697f2 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 681936b5..24bf9758 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 1c6109f4..3272212e 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 a1321ae3..b22debab 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 c6a1f668..a7dccd3f 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 ea85371d..811f1bf2 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 98630dbd..c7d5895a 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 2cd52583..93aab71a 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 eb89b136..311ce01c 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 b9463c43..5b39998d 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 30a23b02..df2d6569 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 84442261..44806984 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 d723811f..b7c1f2d5 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 61ac1914..dde5c002 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 ca66aaff..19e61191 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 54c41ef4..154d94a4 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 803c245a..2420126e 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 f9e5e418..86be5e71 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 2016ca39..5d1f422e 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 70817cb9..9f51ad6f 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 363af541..b737d278 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 467441d1..b8517937 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 3393bc66..e392733c 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 6e34f371..9043047e 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 93efddbd..778a1139 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 f29a93b0..2082d541 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 d17603a8..faa7e1d7 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 2d403d9d..5cc6a694 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 8231bbbf..16161787 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 b7730786..d4fa699a 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 e6627fb3..2f5bc53b 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 aba35be5..49c9b843 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 01972cda..5602e6e5 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 34a9f69e..71c433f8 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 333174fc..8fef24b1 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 75eaa208..65f539d3 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 9e868d6b..418c551f 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 d5b910e3..df46c5d6 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 6f39cddb..653c60fc 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 3a7433be..e2fd21d5 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 26d8e277..bb0861bd 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 e942efca..55a068a6 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 85332ac7..bbdeede9 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 71bc7e2f..f1595231 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 faedbc86..149d48c3 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 ca8c4cb6..e0ee5cd3 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 daf3ed0a..473e291b 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 011acf0b..ec6b2bef 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 1ac5f576..757f1e3e 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 160c96fe..7d0a6848 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 bfade907..52b26420 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 23e071b6..98da133a 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 ac4e8607..e1fcf228 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 752046de..e4b35214 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 48e87301..891e7c2e 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 fbc96b06..032766bb 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 e732222b..d68c0563 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 a9898690..122732b2 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 67db4578..711aa918 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 09b751b1..ee5950eb 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 ef80e154..47250b3f 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 77afd58c..4ffaaf68 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 1bdba11b..cade1256 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 fd98b275..71a689cc 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 0d6451ca..a54172f6 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 bc6bce0a..4bc35ab6 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 28d64b2a..2c00b1f8 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 176f89d1..0c3c1f86 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 c99ccc1a..a139c286 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 bc188608..1e3f5ce2 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 c714aeb0..9cdffac8 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 a1dbc404..2c5c5f97 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 c3419f0d..8af2510c 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 d1f84872..0646d0b2 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 4085547f..bdb4a353 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 5b52a97e..cf4c4522 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 23ca6f03..8a47c14f 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 7e075d8a..ce2edd34 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 9ea307a7..422dd876 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 528c2cd1..3c4c6756 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 0a73d28f..563d4d05 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 f7134753..0eada513 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 fa055d6b..41de880e 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 d1ed4dd2..5f7bff4f 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 77fe4075..e50bf155 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 485f4438..b532de80 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 6f357305..29370f97 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 912b5b8c..e4b5bb20 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 fa5113d5..bac22ecc 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 7d29ba56..ff5d0c6f 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 14425b08..4322584c 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 3b56edc8..15257e78 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 fd90edd0..a08cc952 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 c6848082..bf7e802b 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 11f3648f..cd050319 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 99bdf4a5..01936a45 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 f7d51af0..95f4bb41 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 aedf572d..51c4c814 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 49a22d48..768f721e 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 6f94e3d4..76a980be 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 bbcd7483..ce1c6760 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 1efa7605..2b3a2b1f 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 0f384cf6..0fe1ab49 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 ca0716f9..c7de3dfc 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 e28403c7..8533c8f3 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 ab8b8149..8ea773f2 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 0427ca11..be41b88e 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 ec7a3123..4d920971 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 1411d4df..7be1b320 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 cdbc12ea..492b1b97 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 82e6aa1d..adf614d8 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 cd84e685..08f1e69b 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 211197f0..83bfdada 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 3a4caa4c..0809dd1d 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 89e4c736..d7ed1526 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 c4fb5121..2891b760 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 aabbc98e..17d0e712 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 f5b3d2fd..2f3db020 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 8638cde6..4525124c 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 e21d0151..ce54c63b 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 0022066f..66c568c3 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 2ab9951d..6418ceec 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 793ad26c..dc33b537 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 942b6992..38262045 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 2a6cbaee..fc4a55ca 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 a535c8b3..c2ca3fac 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 0793831e..ab31d8e5 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 e83f8b79..8d55299b 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 5d68faf3..e8a7f84c 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 b72188a9..685077ea 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 f2030ea5..2d331e20 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 9488ac0b..f91f12af 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 98020575..d3715f3c 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 38484744..4d34e23f 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 2cf74a31..9a5e6e79 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 a87e09e5..baea60e2 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 0ab22022..73956ac0 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 38f2004d..39b4ee11 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 e4a2aae4..bf19d76a 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 5c1f156e..5d43bd12 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 f75da9b9..0f0160a4 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 06ab46a9..b8addaf9 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 f095d68d..5a0a6442 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 aedaa5bf..d4ad073e 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 93c10f0e..787cb3f2 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 46f01da3..f1461f29 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 45c04251..928d9adc 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 87d87dd9..e5e58469 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 b0f10606..7d493635 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 40c796e5..c2b314e3 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 79039380..51802e04 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 bf619271..f2cc56eb 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 e98e659d..b3911b4a 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 f132ff9a..de759e3c 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 589752f6..f098f5ee 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 94cc9bc7..1205763e 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 25e7b996..8d58f43b 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 d0838624..80a3c272 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 49307059..38b6d2ec 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 7a2da016..eb381aeb 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 cd3e4aac..23e9b8fc 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 c7e4354a..243d1f68 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 d9c1e584..c10d6406 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 8c1262d0..13b5efd8 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 3a7ce788..1f20666a 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 28a0eed9..b20cd192 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 10293596..17c9cf37 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 839ad278..96adbbdc 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 6feaafdb..ad840c55 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 98848e6d..43f0ecef 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 ef17f44a..7612aecd 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 ab6925c3..d888e176 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 d12a432f..e29f35a7 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 4d3426b6..30f58718 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 898c0900..1c0f163d 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 7153a4cb..ba562868 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 7bf8cbb7..95f6e9eb 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 a366b281..75f15b3e 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 93e9087b..75577592 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 ca798182..b7416f3d 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 ae230cab..4b43c229 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 d15fcdfe..d062c73b 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 39f87505..410fe3e0 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 463c3022..2a2c1078 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 cf8325f0..35366bd5 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 5bae5de9..b23f0543 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 93e6f9d1..6d914b30 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 635a289b..8074f57d 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 0a631bc7..1e29014c 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 181c69b3..268edad8 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 49e50ef8..c5b43cad 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 91180c8e..a9554997 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 09254d50..a06bd676 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 05f2f368..b552e565 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 5b05f674..00f15306 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 e3d829ba..282c5226 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 dd2534fd..105037f8 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 55f766f3..5c83b9a4 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 ab9ef93d..69fb04e7 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 dd3febc2..192dc3fc 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 68f65645..7d93d800 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 c5407609..2e31fe70 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 f31e72dc..ef412080 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 eef814bf..77ab865e 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 72d975aa..057b379d 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 bb0f533f..b214cc25 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 856b1844..09d36d67 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 39a92bab..063dc6da 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 43980e69..8da87920 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 fd572df1..eaabf248 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 f546e1b6..8fdb176a 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 996576f6..a5f079c0 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 e6d248db..f7db00b1 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 ab862800..c21df28b 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 4c72c87c..bfa2f537 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 93f401f1..90df1470 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 d40e94ce..1b1d657a 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 bfc191d5..12e147a9 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 ef07af22..764bf2a7 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 93bdad89..5578a844 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 115a15f0..20c80a17 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 1e147761..452d0b12 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 9dc23ff7..0b00a0ae 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 4fec5dec..b147eab2 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 3e4b2c1e..5b665a85 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 6f14fba8..064f1caa 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 bb1593b8..b2ff328b 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 27496691..390885bd 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 548340c0..220634dd 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 72b4d336..09093ca5 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 fe04fe1e..11fa6ef6 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 9b7d2277..780d7e48 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 6ca9b5a0..9089d41f 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 df55ced6..6fe7c43b 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 7f7ae728..f3440d6c 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 5e862c78..e929d6f9 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 de709eb1..7523956b 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 8b5a0da3..b32889b2 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 286acd0b..b1226a19 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 baf6d723..da23591e 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 c9046daf..39aa0e59 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 b1f294d6..b6b3419e 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
 }