diff --git a/oss-internship-2020/libtiff/test/defer_strile_writing.cc b/oss-internship-2020/libtiff/test/defer_strile_writing.cc
index e403112..5403d2a 100644
--- a/oss-internship-2020/libtiff/test/defer_strile_writing.cc
+++ b/oss-internship-2020/libtiff/test/defer_strile_writing.cc
@@ -254,7 +254,8 @@ void TestWriting(const char* mode, int tiled, int height) {
         uint8_t expected_c = static_cast<uint8_t>(i);
         tilebuffer.fill(0);
 
-        sapi::v::Array<uint8_t> tilebuffer_(tilebuffer.data(), tilebuffer.size());
+        sapi::v::Array<uint8_t> tilebuffer_(tilebuffer.data(),
+                                            tilebuffer.size());
 
         status_or_long = api.TIFFReadEncodedTile(
             &tif2, i, tilebuffer_.PtrBoth(), kTileBufferSize);
diff --git a/oss-internship-2020/libtiff/test/long_tag.cc b/oss-internship-2020/libtiff/test/long_tag.cc
index 99c0eb7..fc1b644 100644
--- a/oss-internship-2020/libtiff/test/long_tag.cc
+++ b/oss-internship-2020/libtiff/test/long_tag.cc
@@ -15,13 +15,13 @@
 #include <array>
 
 #include "check_tag.h"  // NOLINT(build/include)
-#include "tiffio.h"  // NOLINT(build/include)
+#include "tiffio.h"     // NOLINT(build/include)
 
 namespace {
 
 using ::sapi::IsOk;
-using ::testing::Ne;
 using ::testing::IsTrue;
+using ::testing::Ne;
 using ::testing::NotNull;
 
 struct LongTag {
diff --git a/oss-internship-2020/libtiff/test/short_tag.cc b/oss-internship-2020/libtiff/test/short_tag.cc
index aa7d0c5..5620ec5 100644
--- a/oss-internship-2020/libtiff/test/short_tag.cc
+++ b/oss-internship-2020/libtiff/test/short_tag.cc
@@ -16,13 +16,13 @@
 #include <cstdint>
 
 #include "check_tag.h"  // NOLINT(build/include)
-#include "tiffio.h"  // NOLINT(build/include)
+#include "tiffio.h"     // NOLINT(build/include)
 
 namespace {
 
 using ::sapi::IsOk;
-using ::testing::Ne;
 using ::testing::IsTrue;
+using ::testing::Ne;
 using ::testing::NotNull;
 
 constexpr uint16_t kSamplePerPixel = 3;