diff --git a/fxbarcode/oned/BC_OnedCodaBarWriter_unittest.cpp b/fxbarcode/oned/BC_OnedCodaBarWriter_unittest.cpp
index 08ba718..89b0ac8 100644
--- a/fxbarcode/oned/BC_OnedCodaBarWriter_unittest.cpp
+++ b/fxbarcode/oned/BC_OnedCodaBarWriter_unittest.cpp
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "fxbarcode/oned/BC_OnedCodaBarWriter.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/fxbarcode/oned/BC_OnedCode128Writer_unittest.cpp b/fxbarcode/oned/BC_OnedCode128Writer_unittest.cpp
index b759456..19d91f9 100644
--- a/fxbarcode/oned/BC_OnedCode128Writer_unittest.cpp
+++ b/fxbarcode/oned/BC_OnedCode128Writer_unittest.cpp
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "fxbarcode/oned/BC_OnedCode128Writer.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/fxbarcode/oned/BC_OnedCode39Writer_unittest.cpp b/fxbarcode/oned/BC_OnedCode39Writer_unittest.cpp
index e20a607..e263d59 100644
--- a/fxbarcode/oned/BC_OnedCode39Writer_unittest.cpp
+++ b/fxbarcode/oned/BC_OnedCode39Writer_unittest.cpp
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "fxbarcode/oned/BC_OnedCode39Writer.h"
+
 #include <cstring>
 
-#include "fxbarcode/oned/BC_OnedCode39Writer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/fxbarcode/oned/BC_OnedEAN13Writer_unittest.cpp b/fxbarcode/oned/BC_OnedEAN13Writer_unittest.cpp
index 0f85496..55746ba 100644
--- a/fxbarcode/oned/BC_OnedEAN13Writer_unittest.cpp
+++ b/fxbarcode/oned/BC_OnedEAN13Writer_unittest.cpp
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "fxbarcode/oned/BC_OnedEAN13Writer.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/fxbarcode/oned/BC_OnedEAN8Writer_unittest.cpp b/fxbarcode/oned/BC_OnedEAN8Writer_unittest.cpp
index 55a0a33..ae1b823 100644
--- a/fxbarcode/oned/BC_OnedEAN8Writer_unittest.cpp
+++ b/fxbarcode/oned/BC_OnedEAN8Writer_unittest.cpp
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "fxbarcode/oned/BC_OnedEAN8Writer.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/fxbarcode/oned/BC_OnedUPCAWriter_unittest.cpp b/fxbarcode/oned/BC_OnedUPCAWriter_unittest.cpp
index cd9ff47..c5acd23 100644
--- a/fxbarcode/oned/BC_OnedUPCAWriter_unittest.cpp
+++ b/fxbarcode/oned/BC_OnedUPCAWriter_unittest.cpp
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "fxbarcode/oned/BC_OnedUPCAWriter.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
index b23cae7..2881730 100644
--- a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
+++ b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
@@ -47,12 +47,12 @@
       std::vector<uint8_t>* bytes,
       size_t startpos);
 
-  friend class PDF417HighLevelEncoder_EncodeNumeric_Test;
-  friend class PDF417HighLevelEncoder_EncodeBinary_Test;
-  friend class PDF417HighLevelEncoder_EncodeText_Test;
-  friend class PDF417HighLevelEncoder_ConsecutiveDigitCount_Test;
-  friend class PDF417HighLevelEncoder_ConsecutiveTextCount_Test;
-  friend class PDF417HighLevelEncoder_ConsecutiveBinaryCount_Test;
+  friend class PDF417HighLevelEncoderTest_EncodeNumeric_Test;
+  friend class PDF417HighLevelEncoderTest_EncodeBinary_Test;
+  friend class PDF417HighLevelEncoderTest_EncodeText_Test;
+  friend class PDF417HighLevelEncoderTest_ConsecutiveDigitCount_Test;
+  friend class PDF417HighLevelEncoderTest_ConsecutiveTextCount_Test;
+  friend class PDF417HighLevelEncoderTest_ConsecutiveBinaryCount_Test;
 };
 
 #endif  // FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
diff --git a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
index c74aa5c..b9bf819 100644
--- a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
+++ b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
@@ -3,17 +3,18 @@
 // found in the LICENSE file.
 
 #include "fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(PDF417HighLevelEncoder, EncodeHighLevel) {
+TEST(PDF417HighLevelEncoderTest, EncodeHighLevel) {
   // TODO(tsepez): implement test cases.
 }
 
-TEST(PDF417HighLevelEncoder, EncodeText) {
+TEST(PDF417HighLevelEncoderTest, EncodeText) {
   // TODO(tsepez): implement test cases.
 }
 
-TEST(PDF417HighLevelEncoder, EncodeBinary) {
+TEST(PDF417HighLevelEncoderTest, EncodeBinary) {
   struct EncodeBinaryCase {
     const char* input;
     int offset;
@@ -54,7 +55,7 @@
   }
 }
 
-TEST(PDF417HighLevelEncoder, EncodeNumeric) {
+TEST(PDF417HighLevelEncoderTest, EncodeNumeric) {
   struct EncodeNumericCase {
     const wchar_t* input;
     int offset;
@@ -115,7 +116,7 @@
   }
 }
 
-TEST(PDF417HighLevelEncoder, ConsecutiveDigitCount) {
+TEST(PDF417HighLevelEncoderTest, ConsecutiveDigitCount) {
   struct ConsecutiveDigitCase {
     const wchar_t* input;
     int offset;
@@ -159,7 +160,7 @@
   }
 }
 
-TEST(PDF417HighLevelEncoder, ConsecutiveTextCount) {
+TEST(PDF417HighLevelEncoderTest, ConsecutiveTextCount) {
   struct ConsecutiveTextCase {
     const wchar_t* input;
     int offset;
@@ -218,4 +219,6 @@
   }
 }
 
-TEST(PDF417HighLevelEncoder, ConsecutiveBinaryCount) {}
+TEST(PDF417HighLevelEncoderTest, ConsecutiveBinaryCount) {
+  // TODO(tsepez): implement test cases.
+}