diff --git a/test/chat-message.t.cpp b/test/chat-message.t.cpp
index 09ab127..848dfde 100644
--- a/test/chat-message.t.cpp
+++ b/test/chat-message.t.cpp
@@ -1,19 +1,19 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2013, Regents of the University of California
+ * Copyright (c) 2020, Regents of the University of California
  *
  * BSD license, See the LICENSE file for more information
  *
  * Author: Qiuhan Ding <qiuhanding@cs.ucla.edu>
  */
 
-#include <boost/test/unit_test.hpp>
-
 #include "chat-message.hpp"
+
+#include <boost/test/unit_test.hpp>
 #include <ndn-cxx/encoding/buffer-stream.hpp>
 
-namespace chronochat{
-namespace tests{
+namespace chronochat {
+namespace tests {
 
 using std::string;
 
diff --git a/test/chatroom-info.t.cpp b/test/chatroom-info.t.cpp
index f138172..af223d4 100644
--- a/test/chatroom-info.t.cpp
+++ b/test/chatroom-info.t.cpp
@@ -1,3 +1,10 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2020, Regents of the University of California
+ *
+ * BSD license, See the LICENSE file for more information
+ */
+
 #include "chatroom-info.hpp"
 #include <boost/test/unit_test.hpp>
 #include <ndn-cxx/encoding/block.hpp>
diff --git a/test/conf.t.cpp b/test/conf.t.cpp
index 9af3e5d..fabbcfc 100644
--- a/test/conf.t.cpp
+++ b/test/conf.t.cpp
@@ -1,18 +1,18 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2013, Regents of the University of California
+ * Copyright (c) 2020, Regents of the University of California
  *
  * BSD license, See the LICENSE file for more information
  *
  * Author: Qiuhan Ding <qiuhanding@cs.ucla.edu>
  */
 
-#include <boost/test/unit_test.hpp>
-
 #include "conf.hpp"
+
+#include <boost/test/unit_test.hpp>
 #include <ndn-cxx/encoding/buffer-stream.hpp>
 
-namespace chronochat{
+namespace chronochat {
 namespace tests {
 
 using std::string;
diff --git a/test/contact-storage.t.cpp b/test/contact-storage.t.cpp
index 07be3e7..a9265e6 100644
--- a/test/contact-storage.t.cpp
+++ b/test/contact-storage.t.cpp
@@ -1,14 +1,14 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /**
- * Copyright (C) 2013 Regents of the University of California.
+ * Copyright (C) 2020 Regents of the University of California.
  * @author: Yingdi Yu <yingdi@cs.ucla.edu>
  * See COPYING for copyright and distribution information.
  */
 
-#include <boost/test/unit_test.hpp>
-
 #include "contact-storage.hpp"
 #include "cryptopp.hpp"
+
+#include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 
 namespace chronochat {
diff --git a/test/endorse-certificate.t.cpp b/test/endorse-certificate.t.cpp
index baa2ecf..6fef721 100644
--- a/test/endorse-certificate.t.cpp
+++ b/test/endorse-certificate.t.cpp
@@ -1,17 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /**
- * Copyright (C) 2013 Regents of the University of California.
+ * Copyright (C) 2020 Regents of the University of California.
  * @author: Yingdi Yu <yingdi@cs.ucla.edu>
  * See COPYING for copyright and distribution information.
  */
 
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wtautological-compare"
-#pragma clang diagnostic ignored "-Wunused-function"
-#elif __GNUC__
-#pragma GCC diagnostic ignored "-Wunused-function"
-#endif
+#include "endorse-certificate.hpp"
+#include "cryptopp.hpp"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
@@ -20,8 +15,6 @@
 #include <ndn-cxx/encoding/buffer-stream.hpp>
 #include <ndn-cxx/util/time.hpp>
 #include <ndn-cxx/util/io.hpp>
-#include "cryptopp.hpp"
-#include "endorse-certificate.hpp"
 
 namespace chronochat {
 namespace tests {
diff --git a/test/endorse-collection.t.cpp b/test/endorse-collection.t.cpp
index 1af3f6b..8448779 100644
--- a/test/endorse-collection.t.cpp
+++ b/test/endorse-collection.t.cpp
@@ -1,18 +1,18 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2013, Regents of the University of California
+ * Copyright (c) 2020, Regents of the University of California
  *
  * BSD license, See the LICENSE file for more information
  *
  * Author: Qiuhan Ding <qiuhanding@cs.ucla.edu>
  */
 
-#include <boost/test/unit_test.hpp>
-
 #include "endorse-collection.hpp"
+
+#include <boost/test/unit_test.hpp>
 #include <ndn-cxx/encoding/buffer-stream.hpp>
 
-namespace chronochat{
+namespace chronochat {
 namespace tests {
 
 using std::string;
diff --git a/test/main.cpp b/test/main.cpp
index 6b0a14a..e418730 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2013, Regents of the University of California
+ * Copyright (c) 2020, Regents of the University of California
  *
  * BSD license, See the LICENSE file for more information
  *
@@ -9,5 +9,6 @@
 
 #define BOOST_TEST_MAIN 1
 #define BOOST_TEST_DYN_LINK 1
+#define BOOST_TEST_MODULE chronochat
 
 #include <boost/test/unit_test.hpp>
diff --git a/test/profile.t.cpp b/test/profile.t.cpp
index 3e85f38..33ebb06 100644
--- a/test/profile.t.cpp
+++ b/test/profile.t.cpp
@@ -1,13 +1,13 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /**
- * Copyright (C) 2013 Regents of the University of California.
+ * Copyright (C) 2020 Regents of the University of California.
  * @author: Yingdi Yu <yingdi@cs.ucla.edu>
  * See COPYING for copyright and distribution information.
  */
 
-#include <boost/test/unit_test.hpp>
-
 #include "profile.hpp"
+
+#include <boost/test/unit_test.hpp>
 #include <ndn-cxx/encoding/buffer-stream.hpp>
 
 namespace chronochat {