diff --git a/tests/core/event-emitter.cpp b/tests/core/event-emitter.cpp
index b6ee048..b03f71d 100644
--- a/tests/core/event-emitter.cpp
+++ b/tests/core/event-emitter.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "core/event-emitter.hpp"
 
@@ -17,28 +35,28 @@
 {
 public:
   EventEmitterTester();
-  
+
   int m_hit;
   int m_a1;
   int m_a2;
   int m_a3;
   int m_a4;
-  
+
   void
   clear();
-  
+
   void
   f0();
-  
+
   void
   f1(int a1);
-  
+
   void
   f2(int a1, int a2);
-  
+
   void
   f3(int a1, int a2, int a3);
-  
+
   void
   f4(int a1, int a2, int a3, int a4);
 };
@@ -104,7 +122,7 @@
 {
 public:
   EventEmitterTest_RefObject() {}
-  
+
   EventEmitterTest_RefObject(const EventEmitterTest_RefObject& other);
 };
 
@@ -134,7 +152,7 @@
   ee += bind(&EventEmitterTester::f0, &eet1);
   ee += bind(&EventEmitterTester::f0, &eet2);
   ee();
-  
+
   BOOST_CHECK_EQUAL(eet1.m_hit, 1);
   BOOST_CHECK_EQUAL(eet2.m_hit, 1);
 }
@@ -145,7 +163,7 @@
   EventEmitter<> ee;
   ee += bind(&EventEmitterTester::f0, &eet);
   ee();
-  
+
   BOOST_CHECK_EQUAL(eet.m_hit, 1);
 }
 
@@ -155,7 +173,7 @@
   EventEmitter<int> ee;
   ee += bind(&EventEmitterTester::f1, &eet, _1);
   ee(11);
-  
+
   BOOST_CHECK_EQUAL(eet.m_hit, 1);
   BOOST_CHECK_EQUAL(eet.m_a1, 11);
 }
@@ -166,7 +184,7 @@
   EventEmitter<int,int> ee;
   ee += bind(&EventEmitterTester::f2, &eet, _1, _2);
   ee(21, 22);
-  
+
   BOOST_CHECK_EQUAL(eet.m_hit, 1);
   BOOST_CHECK_EQUAL(eet.m_a1, 21);
   BOOST_CHECK_EQUAL(eet.m_a2, 22);
@@ -178,7 +196,7 @@
   EventEmitter<int,int,int> ee;
   ee += bind(&EventEmitterTester::f3, &eet, _1, _2, _3);
   ee(31, 32, 33);
-  
+
   BOOST_CHECK_EQUAL(eet.m_hit, 1);
   BOOST_CHECK_EQUAL(eet.m_a1, 31);
   BOOST_CHECK_EQUAL(eet.m_a2, 32);
@@ -191,7 +209,7 @@
   EventEmitter<int,int,int,int> ee;
   ee += bind(&EventEmitterTester::f4, &eet, _1, _2, _3, _4);
   ee(41, 42, 43, 44);
-  
+
   BOOST_CHECK_EQUAL(eet.m_hit, 1);
   BOOST_CHECK_EQUAL(eet.m_a1, 41);
   BOOST_CHECK_EQUAL(eet.m_a2, 42);
@@ -205,11 +223,11 @@
 {
   EventEmitterTest_RefObject refObject;
   g_EventEmitterTest_RefObject_copyCount = 0;
-  
+
   EventEmitter<EventEmitterTest_RefObject> ee;
   ee += &EventEmitterTest_RefObject_byVal;
   ee(refObject);
-  
+
   BOOST_CHECK_EQUAL(g_EventEmitterTest_RefObject_copyCount, 1);
 }
 
@@ -219,11 +237,11 @@
 {
   EventEmitterTest_RefObject refObject;
   g_EventEmitterTest_RefObject_copyCount = 0;
-  
+
   EventEmitter<EventEmitterTest_RefObject> ee;
   ee += &EventEmitterTest_RefObject_byRef;
   ee(refObject);
-  
+
   BOOST_CHECK_EQUAL(g_EventEmitterTest_RefObject_copyCount, 0);
 }
 
diff --git a/tests/core/face-uri.cpp b/tests/core/face-uri.cpp
index 80d5a89..6259d77 100644
--- a/tests/core/face-uri.cpp
+++ b/tests/core/face-uri.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "core/face-uri.hpp"
 #ifdef HAVE_PCAP
diff --git a/tests/core/global-configuration.cpp b/tests/core/global-configuration.cpp
index a288147..77c28c4 100644
--- a/tests/core/global-configuration.cpp
+++ b/tests/core/global-configuration.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "../test-common.hpp"
 #include "core/logger.hpp"
diff --git a/tests/core/limited-io.cpp b/tests/core/limited-io.cpp
index 784bddf..b22be89 100644
--- a/tests/core/limited-io.cpp
+++ b/tests/core/limited-io.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "limited-io.hpp"
 #include "core/logger.hpp"
diff --git a/tests/core/limited-io.hpp b/tests/core/limited-io.hpp
index 94fe476..2d5788c 100644
--- a/tests/core/limited-io.hpp
+++ b/tests/core/limited-io.hpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #ifndef NFD_TEST_CORE_LIMITED_IO_HPP
 #define NFD_TEST_CORE_LIMITED_IO_HPP
diff --git a/tests/core/logger.cpp b/tests/core/logger.cpp
index 628c1ce..1ccbc31 100644
--- a/tests/core/logger.cpp
+++ b/tests/core/logger.cpp
@@ -1,10 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
  *
- * Author: Ilya Moiseenko <iliamo@ucla.edu>
- */
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "core/logger.hpp"
 
diff --git a/tests/core/map-value-iterator.cpp b/tests/core/map-value-iterator.cpp
index c874b8f..8a46da6 100644
--- a/tests/core/map-value-iterator.cpp
+++ b/tests/core/map-value-iterator.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "core/map-value-iterator.hpp"
 #include <boost/concept_check.hpp>
diff --git a/tests/core/network-interface.cpp b/tests/core/network-interface.cpp
index bdfd21f..2fb9c0b 100644
--- a/tests/core/network-interface.cpp
+++ b/tests/core/network-interface.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "core/network-interface.hpp"
 #include "tests/test-common.hpp"
diff --git a/tests/core/resolver.cpp b/tests/core/resolver.cpp
index 4d7460f..a8e05ce 100644
--- a/tests/core/resolver.cpp
+++ b/tests/core/resolver.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "core/resolver.hpp"
 #include "core/logger.hpp"
diff --git a/tests/core/scheduler.cpp b/tests/core/scheduler.cpp
index 6d648b9..e30a41e 100644
--- a/tests/core/scheduler.cpp
+++ b/tests/core/scheduler.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "core/scheduler.hpp"
 
diff --git a/tests/core/version.cpp b/tests/core/version.cpp
index fb551e3..ee29615 100644
--- a/tests/core/version.cpp
+++ b/tests/core/version.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "core/version.hpp"
 #include "core/logger.hpp"
@@ -19,7 +37,7 @@
 BOOST_AUTO_TEST_CASE(Version)
 {
   NFD_LOG_INFO("NFD_VERSION " << NFD_VERSION);
-  
+
   BOOST_CHECK_EQUAL(NFD_VERSION, NFD_VERSION_MAJOR * 1000000 +
                                  NFD_VERSION_MINOR * 1000 +
                                  NFD_VERSION_PATCH);
@@ -28,11 +46,11 @@
 BOOST_AUTO_TEST_CASE(VersionString)
 {
   NFD_LOG_INFO("NFD_VERSION_STRING " << NFD_VERSION_STRING);
-  
+
   BOOST_STATIC_ASSERT(NFD_VERSION_MAJOR < 1000);
   char buf[12];
   snprintf(buf, sizeof(buf), "%d.%d.%d", NFD_VERSION_MAJOR, NFD_VERSION_MINOR, NFD_VERSION_PATCH);
-  
+
   BOOST_CHECK_EQUAL(std::string(NFD_VERSION_STRING), std::string(buf));
 }
 
diff --git a/tests/face/dummy-face.hpp b/tests/face/dummy-face.hpp
index 9c7252c..e4d75c2 100644
--- a/tests/face/dummy-face.hpp
+++ b/tests/face/dummy-face.hpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #ifndef NFD_TEST_FACE_DUMMY_FACE_HPP
 #define NFD_TEST_FACE_DUMMY_FACE_HPP
diff --git a/tests/face/ethernet-address.cpp b/tests/face/ethernet-address.cpp
index 0f726e1..02f6918 100644
--- a/tests/face/ethernet-address.cpp
+++ b/tests/face/ethernet-address.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "face/ethernet.hpp"
 #include "tests/test-common.hpp"
diff --git a/tests/face/ethernet.cpp b/tests/face/ethernet.cpp
index 1224ee0..706a697 100644
--- a/tests/face/ethernet.cpp
+++ b/tests/face/ethernet.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "face/ethernet-factory.hpp"
 #include "core/network-interface.hpp"
diff --git a/tests/face/face.cpp b/tests/face/face.cpp
index 6187035..46c0345 100644
--- a/tests/face/face.cpp
+++ b/tests/face/face.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "face/face.hpp"
 #include "face/local-face.hpp"
diff --git a/tests/face/ndnlp.cpp b/tests/face/ndnlp.cpp
index 06245c0..7681e86 100644
--- a/tests/face/ndnlp.cpp
+++ b/tests/face/ndnlp.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "face/ndnlp-sequence-generator.hpp"
 #include "face/ndnlp-slicer.hpp"
diff --git a/tests/face/tcp.cpp b/tests/face/tcp.cpp
index b71de48..0c2a094 100644
--- a/tests/face/tcp.cpp
+++ b/tests/face/tcp.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "face/tcp-factory.hpp"
 #include <ndn-cpp-dev/security/key-chain.hpp>
diff --git a/tests/face/udp.cpp b/tests/face/udp.cpp
index d4bd8bb..776d9a7 100644
--- a/tests/face/udp.cpp
+++ b/tests/face/udp.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "face/udp-factory.hpp"
 
diff --git a/tests/face/unix-stream.cpp b/tests/face/unix-stream.cpp
index 4d7d984..7e08b78 100644
--- a/tests/face/unix-stream.cpp
+++ b/tests/face/unix-stream.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "face/unix-stream-factory.hpp"
 
diff --git a/tests/fw/broadcast-strategy.cpp b/tests/fw/broadcast-strategy.cpp
index 9c69c10..7a4c6dc 100644
--- a/tests/fw/broadcast-strategy.cpp
+++ b/tests/fw/broadcast-strategy.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "fw/broadcast-strategy.hpp"
 #include "strategy-tester.hpp"
diff --git a/tests/fw/client-control-strategy.cpp b/tests/fw/client-control-strategy.cpp
index 326bd77..3ee72ca 100644
--- a/tests/fw/client-control-strategy.cpp
+++ b/tests/fw/client-control-strategy.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "fw/client-control-strategy.hpp"
 #include "strategy-tester.hpp"
diff --git a/tests/fw/dummy-strategy.hpp b/tests/fw/dummy-strategy.hpp
index 81b9e70..5f6587b 100644
--- a/tests/fw/dummy-strategy.hpp
+++ b/tests/fw/dummy-strategy.hpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #ifndef NFD_TEST_FW_DUMMY_STRATEGY_HPP
 #define NFD_TEST_FW_DUMMY_STRATEGY_HPP
@@ -23,7 +41,7 @@
     : Strategy(forwarder, name)
   {
   }
-  
+
   virtual void
   afterReceiveInterest(const Face& inFace,
                        const Interest& interest,
@@ -31,7 +49,7 @@
                        shared_ptr<pit::Entry> pitEntry)
   {
     ++m_afterReceiveInterest_count;
-    
+
     if (static_cast<bool>(m_interestOutFace)) {
       this->sendInterest(pitEntry, m_interestOutFace);
     }
@@ -39,7 +57,7 @@
       this->rejectPendingInterest(pitEntry);
     }
   }
-  
+
   virtual void
   beforeSatisfyPendingInterest(shared_ptr<pit::Entry> pitEntry,
                                const Face& inFace, const Data& data)
@@ -57,7 +75,7 @@
   int m_afterReceiveInterest_count;
   int m_beforeSatisfyPendingInterest_count;
   int m_beforeExpirePendingInterest_count;
-  
+
   /// outFace to use in afterReceiveInterest, nullptr to reject
   shared_ptr<Face> m_interestOutFace;
 };
diff --git a/tests/fw/face-table.cpp b/tests/fw/face-table.cpp
index 9d1d930..42d1f53 100644
--- a/tests/fw/face-table.cpp
+++ b/tests/fw/face-table.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "fw/face-table.hpp"
 #include "fw/forwarder.hpp"
diff --git a/tests/fw/forwarder.cpp b/tests/fw/forwarder.cpp
index 53cb145..a2ee67e 100644
--- a/tests/fw/forwarder.cpp
+++ b/tests/fw/forwarder.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "fw/forwarder.hpp"
 #include "tests/face/dummy-face.hpp"
diff --git a/tests/fw/ncc-strategy.cpp b/tests/fw/ncc-strategy.cpp
index 044b3ec..493e621 100644
--- a/tests/fw/ncc-strategy.cpp
+++ b/tests/fw/ncc-strategy.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "fw/ncc-strategy.hpp"
 #include "strategy-tester.hpp"
diff --git a/tests/fw/strategy-tester.hpp b/tests/fw/strategy-tester.hpp
index 71eb61b..c268a8e 100644
--- a/tests/fw/strategy-tester.hpp
+++ b/tests/fw/strategy-tester.hpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #ifndef NFD_TEST_FW_STRATEGY_TESTER_HPP
 #define NFD_TEST_FW_STRATEGY_TESTER_HPP
@@ -27,7 +45,7 @@
     : S(forwarder, Name(S::STRATEGY_NAME).append("tester"))
   {
   }
-  
+
   /// fires after each Action
   EventEmitter<> onAction;
 
diff --git a/tests/main.cpp b/tests/main.cpp
index 6b0a14a..580d72b 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,11 +1,26 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
-/*
- * Copyright (c) 2013, Regents of the University of California
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
  *
- * BSD license, See the LICENSE file for more information
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
  *
- * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
- */
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #define BOOST_TEST_MAIN 1
 #define BOOST_TEST_DYN_LINK 1
diff --git a/tests/mgmt/command-validator.cpp b/tests/mgmt/command-validator.cpp
index e2cf51c..7f34971 100644
--- a/tests/mgmt/command-validator.cpp
+++ b/tests/mgmt/command-validator.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/command-validator.hpp"
 #include "mgmt/config-file.hpp"
@@ -580,4 +598,3 @@
 } // namespace tests
 
 } // namespace nfd
-
diff --git a/tests/mgmt/config-file.cpp b/tests/mgmt/config-file.cpp
index 830ebbb..df0d9c3 100644
--- a/tests/mgmt/config-file.cpp
+++ b/tests/mgmt/config-file.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 
 #include "mgmt/config-file.hpp"
diff --git a/tests/mgmt/face-flags.cpp b/tests/mgmt/face-flags.cpp
index 00e4c8b..102c8a2 100644
--- a/tests/mgmt/face-flags.cpp
+++ b/tests/mgmt/face-flags.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/face-flags.hpp"
 
diff --git a/tests/mgmt/face-manager.cpp b/tests/mgmt/face-manager.cpp
index ebae6f7..3b07274 100644
--- a/tests/mgmt/face-manager.cpp
+++ b/tests/mgmt/face-manager.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/face-manager.hpp"
 #include "mgmt/internal-face.hpp"
@@ -1572,5 +1590,3 @@
 
 } // namespace tests
 } // namespace nfd
-
-
diff --git a/tests/mgmt/face-status-publisher-common.hpp b/tests/mgmt/face-status-publisher-common.hpp
index 2e7ec55..1c8369d 100644
--- a/tests/mgmt/face-status-publisher-common.hpp
+++ b/tests/mgmt/face-status-publisher-common.hpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #ifndef NFD_TESTS_MGMT_FACE_STATUS_PUBLISHER_COMMON_HPP
 #define NFD_TESTS_MGMT_FACE_STATUS_PUBLISHER_COMMON_HPP
diff --git a/tests/mgmt/face-status-publisher.cpp b/tests/mgmt/face-status-publisher.cpp
index 0f758bc..836ea2d 100644
--- a/tests/mgmt/face-status-publisher.cpp
+++ b/tests/mgmt/face-status-publisher.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "face-status-publisher-common.hpp"
 
diff --git a/tests/mgmt/fib-enumeration-publisher-common.hpp b/tests/mgmt/fib-enumeration-publisher-common.hpp
index 25bf215..cfe4232 100644
--- a/tests/mgmt/fib-enumeration-publisher-common.hpp
+++ b/tests/mgmt/fib-enumeration-publisher-common.hpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #ifndef NFD_TESTS_MGMT_FIB_ENUMERATION_PUBLISHER_COMMON_HPP
 #define NFD_TESTS_MGMT_FIB_ENUMERATION_PUBLISHER_COMMON_HPP
diff --git a/tests/mgmt/fib-enumeration-publisher.cpp b/tests/mgmt/fib-enumeration-publisher.cpp
index 2ba673c..725d51e 100644
--- a/tests/mgmt/fib-enumeration-publisher.cpp
+++ b/tests/mgmt/fib-enumeration-publisher.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/fib-enumeration-publisher.hpp"
 
diff --git a/tests/mgmt/fib-manager.cpp b/tests/mgmt/fib-manager.cpp
index d672ab7..f2d059a 100644
--- a/tests/mgmt/fib-manager.cpp
+++ b/tests/mgmt/fib-manager.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/fib-manager.hpp"
 #include "table/fib.hpp"
diff --git a/tests/mgmt/internal-face.cpp b/tests/mgmt/internal-face.cpp
index 8f70402..6bd63d1 100644
--- a/tests/mgmt/internal-face.cpp
+++ b/tests/mgmt/internal-face.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/internal-face.hpp"
 #include "tests/face/dummy-face.hpp"
diff --git a/tests/mgmt/manager-base.cpp b/tests/mgmt/manager-base.cpp
index 4e690a9..74fcb6e 100644
--- a/tests/mgmt/manager-base.cpp
+++ b/tests/mgmt/manager-base.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/manager-base.hpp"
 #include "mgmt/internal-face.hpp"
diff --git a/tests/mgmt/notification-stream.cpp b/tests/mgmt/notification-stream.cpp
index 1883a8e..32f5a20 100644
--- a/tests/mgmt/notification-stream.cpp
+++ b/tests/mgmt/notification-stream.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/notification-stream.hpp"
 #include "mgmt/internal-face.hpp"
@@ -120,4 +138,3 @@
 
 } // namespace tests
 } // namespace nfd
-
diff --git a/tests/mgmt/segment-publisher.cpp b/tests/mgmt/segment-publisher.cpp
index 0d65ee6..e40f372 100644
--- a/tests/mgmt/segment-publisher.cpp
+++ b/tests/mgmt/segment-publisher.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/segment-publisher.hpp"
 #include "mgmt/internal-face.hpp"
diff --git a/tests/mgmt/status-server.cpp b/tests/mgmt/status-server.cpp
index 972d8a3..14cdf44 100644
--- a/tests/mgmt/status-server.cpp
+++ b/tests/mgmt/status-server.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/status-server.hpp"
 #include "fw/forwarder.hpp"
diff --git a/tests/mgmt/strategy-choice-manager.cpp b/tests/mgmt/strategy-choice-manager.cpp
index 9f9c3ce..43d163c 100644
--- a/tests/mgmt/strategy-choice-manager.cpp
+++ b/tests/mgmt/strategy-choice-manager.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "mgmt/strategy-choice-manager.hpp"
 #include "face/face.hpp"
diff --git a/tests/mgmt/validation-common.cpp b/tests/mgmt/validation-common.cpp
index 3ad1701..2e4cce9 100644
--- a/tests/mgmt/validation-common.cpp
+++ b/tests/mgmt/validation-common.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "validation-common.hpp"
 
@@ -30,4 +48,3 @@
 
 } // namespace tests
 } // namespace nfd
-
diff --git a/tests/mgmt/validation-common.hpp b/tests/mgmt/validation-common.hpp
index 9b876d9..dd7b443 100644
--- a/tests/mgmt/validation-common.hpp
+++ b/tests/mgmt/validation-common.hpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #ifndef NFD_TEST_MGMT_VALIDATION_COMMON_HPP
 #define NFD_TEST_MGMT_VALIDATION_COMMON_HPP
@@ -37,12 +55,12 @@
   CommandIdentityGlobalFixture();
 
   ~CommandIdentityGlobalFixture();
-  
+
   static const Name& getIdentityName()
   {
     return s_identityName;
   }
-  
+
   static shared_ptr<ndn::IdentityCertificate> getCertificate()
   {
     BOOST_ASSERT(static_cast<bool>(s_certificate));
diff --git a/tests/table/cs.cpp b/tests/table/cs.cpp
index 5bb6eb7..f236d77 100644
--- a/tests/table/cs.cpp
+++ b/tests/table/cs.cpp
@@ -1,10 +1,28 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
  *
- * Author: Ilya Moiseenko <iliamo@ucla.edu>
- */
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * \author Ilya Moiseenko <iliamo@ucla.edu>
+ **/
 
 #include "table/cs.hpp"
 #include "table/cs-entry.hpp"
@@ -32,13 +50,13 @@
 BOOST_AUTO_TEST_CASE(Insertion)
 {
   Cs cs;
-  
+
   shared_ptr<Data> data = make_shared<Data>("/insertion");
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
   data->setSignature(fakeSignature);
-  
+
   BOOST_CHECK_EQUAL(cs.insert(*data), true);
 }
 
@@ -48,23 +66,23 @@
 
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   shared_ptr<Data> data = make_shared<Data>("/a");
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/b");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
- 
+
   shared_ptr<Data> data3 = make_shared<Data>("/c");
   data3->setSignature(fakeSignature);
   cs.insert(*data3);
-  
+
   shared_ptr<Data> data4 = make_shared<Data>("/d");
   data4->setSignature(fakeSignature);
   cs.insert(*data4);
-  
+
   BOOST_CHECK_EQUAL(cs.size(), 4);
 }
 
@@ -72,18 +90,18 @@
 BOOST_AUTO_TEST_CASE(DuplicateInsertion)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   shared_ptr<Data> data0 = make_shared<Data>("/insert/smth");
   data0->setSignature(fakeSignature);
   BOOST_CHECK_EQUAL(cs.insert(*data0), true);
-  
+
   shared_ptr<Data> data = make_shared<Data>("/insert/duplicate");
   data->setSignature(fakeSignature);
   BOOST_CHECK_EQUAL(cs.insert(*data), true);
-  
+
   cs.insert(*data);
   BOOST_CHECK_EQUAL(cs.size(), 2);
 }
@@ -92,17 +110,17 @@
 BOOST_AUTO_TEST_CASE(DuplicateInsertion2)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   shared_ptr<Data> data = make_shared<Data>("/insert/duplicate");
   data->setSignature(fakeSignature);
   BOOST_CHECK_EQUAL(cs.insert(*data), true);
-  
+
   cs.insert(*data);
   BOOST_CHECK_EQUAL(cs.size(), 1);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/insert/original");
   data2->setSignature(fakeSignature);
   BOOST_CHECK_EQUAL(cs.insert(*data2), true);
@@ -112,20 +130,20 @@
 BOOST_AUTO_TEST_CASE(InsertAndFind)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   Name name("/insert/and/find");
-  
+
   shared_ptr<Data> data = make_shared<Data>(name);
   data->setSignature(fakeSignature);
   BOOST_CHECK_EQUAL(cs.insert(*data), true);
-  
+
   shared_ptr<Interest> interest = make_shared<Interest>(name);
-  
+
   const Data* found = cs.find(*interest);
-  
+
   BOOST_REQUIRE(found != 0);
   BOOST_CHECK_EQUAL(data->getName(), found->getName());
 }
@@ -133,20 +151,20 @@
 BOOST_AUTO_TEST_CASE(InsertAndNotFind)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   Name name("/insert/and/find");
   shared_ptr<Data> data = make_shared<Data>(name);
   data->setSignature(fakeSignature);
   BOOST_CHECK_EQUAL(cs.insert(*data), true);
-  
+
   Name name2("/not/find");
   shared_ptr<Interest> interest = make_shared<Interest>(name2);
-  
+
   const Data* found = cs.find(*interest);
-  
+
   BOOST_CHECK_EQUAL(found, static_cast<const Data*>(0));
 }
 
@@ -154,15 +172,15 @@
 BOOST_AUTO_TEST_CASE(InsertAndErase)
 {
   CsAccessor cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   shared_ptr<Data> data = make_shared<Data>("/insertandelete");
   data->setSignature(fakeSignature);
   cs.insert(*data);
   BOOST_CHECK_EQUAL(cs.size(), 1);
-  
+
   cs.evictItem_accessor();
   BOOST_CHECK_EQUAL(cs.size(), 0);
 }
@@ -170,29 +188,29 @@
 BOOST_AUTO_TEST_CASE(StalenessQueue)
 {
   CsAccessor cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   Name name2("/insert/fresh");
   shared_ptr<Data> data2 = make_shared<Data>(name2);
   data2->setFreshnessPeriod(time::milliseconds(5000));
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
-  
+
   Name name("/insert/expire");
   shared_ptr<Data> data = make_shared<Data>(name);
   data->setFreshnessPeriod(time::milliseconds(500));
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   BOOST_CHECK_EQUAL(cs.size(), 2);
-  
+
   sleep(1);
-  
+
   cs.evictItem_accessor();
   BOOST_CHECK_EQUAL(cs.size(), 1);
-  
+
   shared_ptr<Interest> interest = make_shared<Interest>(name2);
   const Data* found = cs.find(*interest);
   BOOST_REQUIRE(found != 0);
@@ -210,23 +228,23 @@
   shared_ptr<Data> data = make_shared<Data>("/a");
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/b");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
- 
+
   shared_ptr<Data> data3 = make_shared<Data>("/c");
   data3->setSignature(fakeSignature);
   cs.insert(*data3);
-  
+
   shared_ptr<Data> data4 = make_shared<Data>("/d");
   data4->setSignature(fakeSignature);
   cs.insert(*data4);
- 
+
   shared_ptr<Data> data5 = make_shared<Data>("/e");
   data5->setSignature(fakeSignature);
   cs.insert(*data5);
-  
+
   BOOST_CHECK_EQUAL(cs.size(), 4);
 }
 
@@ -234,33 +252,33 @@
 BOOST_AUTO_TEST_CASE(Replacement2)
 {
   Cs cs(3);
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
 
   shared_ptr<Data> data = make_shared<Data>("/a");
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/b");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
- 
+
   shared_ptr<Data> data3 = make_shared<Data>("/c");
   data3->setSignature(fakeSignature);
   cs.insert(*data3);
-  
+
   shared_ptr<Data> data4 = make_shared<Data>("/d");
   data4->setSignature(fakeSignature);
   cs.insert(*data4);
-  
+
   BOOST_CHECK_EQUAL(cs.size(), 3);
 }
 
 BOOST_AUTO_TEST_CASE(InsertAndEraseByName)
 {
   CsAccessor cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
 
@@ -268,10 +286,10 @@
   shared_ptr<Data> data = make_shared<Data>(name);
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   uint8_t digest1[32];
   ndn::ndn_digestSha256(data->wireEncode().wire(), data->wireEncode().size(), digest1);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/a");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
@@ -281,7 +299,7 @@
   cs.insert(*data3);
 
   BOOST_CHECK_EQUAL(cs.size(), 3);
-  
+
   name.append(digest1, 32);
   cs.erase(name);
   BOOST_CHECK_EQUAL(cs.size(), 2);
@@ -294,12 +312,12 @@
 
   shared_ptr<Data> data = make_shared<Data>("/digest/compute");
   data->setSignature(fakeSignature);
-  
+
   uint8_t digest1[32];
   ndn::ndn_digestSha256(data->wireEncode().wire(), data->wireEncode().size(), digest1);
-  
+
   cs::Entry* entry = new cs::Entry(*data, false);
-  
+
   BOOST_CHECK_EQUAL_COLLECTIONS(digest1, digest1+32,
                                 entry->getDigest()->buf(), entry->getDigest()->buf()+32);
 }
@@ -307,34 +325,34 @@
 BOOST_AUTO_TEST_CASE(InsertCanonical)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   shared_ptr<Data> data = make_shared<Data>("/a");
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/b");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
-  
+
   shared_ptr<Data> data3 = make_shared<Data>("/c");
   data3->setSignature(fakeSignature);
   cs.insert(*data3);
-  
+
   shared_ptr<Data> data4 = make_shared<Data>("/d");
   data4->setSignature(fakeSignature);
   cs.insert(*data4);
-  
+
   shared_ptr<Data> data5 = make_shared<Data>("/c/c/1/2/3/4/5/6");
   data5->setSignature(fakeSignature);
   cs.insert(*data5);
-  
+
   shared_ptr<Data> data6 = make_shared<Data>("/c/c/1/2/3");
   data6->setSignature(fakeSignature);
   cs.insert(*data6);
-  
+
   shared_ptr<Data> data7 = make_shared<Data>("/c/c/1");
   data7->setSignature(fakeSignature);
   cs.insert(*data7);
@@ -343,37 +361,37 @@
 BOOST_AUTO_TEST_CASE(EraseCanonical)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   shared_ptr<Data> data = make_shared<Data>("/a");
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/b");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
-  
+
   shared_ptr<Data> data3 = make_shared<Data>("/c");
   data3->setSignature(fakeSignature);
   cs.insert(*data3);
-  
+
   shared_ptr<Data> data4 = make_shared<Data>("/d");
   data4->setSignature(fakeSignature);
   cs.insert(*data4);
-  
+
   uint8_t digest1[32];
   ndn::ndn_digestSha256(data->wireEncode().wire(), data->wireEncode().size(), digest1);
 
   shared_ptr<Data> data5 = make_shared<Data>("/c/c/1/2/3/4/5/6");
   data5->setSignature(fakeSignature);
   cs.insert(*data5);
-  
+
   shared_ptr<Data> data6 = make_shared<Data>("/c/c/1/2/3");
   data6->setSignature(fakeSignature);
   cs.insert(*data6);
-  
+
   shared_ptr<Data> data7 = make_shared<Data>("/c/c/1");
   data7->setSignature(fakeSignature);
   cs.insert(*data7);
@@ -387,15 +405,15 @@
 BOOST_AUTO_TEST_CASE(ImplicitDigestSelector)
 {
   CsAccessor cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   Name name("/digest/works");
   shared_ptr<Data> data = make_shared<Data>(name);
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/a");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
@@ -403,24 +421,24 @@
   shared_ptr<Data> data3 = make_shared<Data>("/z/z/z");
   data3->setSignature(fakeSignature);
   cs.insert(*data3);
-  
+
   uint8_t digest1[32];
   ndn::ndn_digestSha256(data->wireEncode().wire(), data->wireEncode().size(), digest1);
-  
+
   uint8_t digest2[32] = {0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1};
-  
+
   shared_ptr<Interest> interest = make_shared<Interest>(boost::cref(Name(name).append(digest1, 32)));
   interest->setMinSuffixComponents(0);
   interest->setMaxSuffixComponents(0);
-  
+
   const Data* found = cs.find(*interest);
   BOOST_CHECK_NE(found, static_cast<const Data*>(0));
   BOOST_CHECK_EQUAL(found->getName(), name);
-  
+
   shared_ptr<Interest> interest2 = make_shared<Interest>(boost::cref(Name(name).append(digest2, 32)));
   interest2->setMinSuffixComponents(0);
   interest2->setMaxSuffixComponents(0);
-  
+
   const Data* notfound = cs.find(*interest2);
   BOOST_CHECK_EQUAL(notfound, static_cast<const Data*>(0));
 }
@@ -428,43 +446,43 @@
 BOOST_AUTO_TEST_CASE(ChildSelector)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   shared_ptr<Data> data = make_shared<Data>("/a");
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/b");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
-  
+
   shared_ptr<Data> data4 = make_shared<Data>("/d");
   data4->setSignature(fakeSignature);
   cs.insert(*data4);
-  
+
   shared_ptr<Data> data5 = make_shared<Data>("/c/c");
   data5->setSignature(fakeSignature);
   cs.insert(*data5);
-  
+
   shared_ptr<Data> data6 = make_shared<Data>("/c/f");
   data6->setSignature(fakeSignature);
   cs.insert(*data6);
-  
+
   shared_ptr<Data> data7 = make_shared<Data>("/c/n");
   data7->setSignature(fakeSignature);
   cs.insert(*data7);
-  
+
   shared_ptr<Interest> interest = make_shared<Interest>("/c");
   interest->setChildSelector(1);
-  
+
   const Data* found = cs.find(*interest);
   BOOST_CHECK_EQUAL(found->getName(), "/c/n");
 
   shared_ptr<Interest> interest2 = make_shared<Interest>("/c");
   interest2->setChildSelector(0);
-  
+
   const Data* found2 = cs.find(*interest2);
   BOOST_CHECK_EQUAL(found2->getName(), "/c/c");
 }
@@ -472,29 +490,29 @@
 BOOST_AUTO_TEST_CASE(ChildSelector2)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
 
   shared_ptr<Data> data = make_shared<Data>("/a/b/1");
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/a/b/2");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
-  
+
   shared_ptr<Data> data3 = make_shared<Data>("/a/z/1");
   data3->setSignature(fakeSignature);
   cs.insert(*data3);
-  
+
   shared_ptr<Data> data4 = make_shared<Data>("/a/z/2");
   data4->setSignature(fakeSignature);
   cs.insert(*data4);
-  
+
   shared_ptr<Interest> interest = make_shared<Interest>("/a");
   interest->setChildSelector(1);
-  
+
   const Data* found = cs.find(*interest);
   BOOST_CHECK_EQUAL(found->getName(), "/a/z/1");
 }
@@ -502,21 +520,21 @@
 BOOST_AUTO_TEST_CASE(MustBeFreshSelector)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   Name name("/insert/nonfresh");
   shared_ptr<Data> data = make_shared<Data>(name);
   data->setFreshnessPeriod(time::milliseconds(500));
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   sleep(1);
-  
+
   shared_ptr<Interest> interest = make_shared<Interest>(name);
   interest->setMustBeFresh(true);
-  
+
   const Data* found = cs.find(*interest);
   BOOST_CHECK_EQUAL(found, static_cast<const Data*>(0));
 }
@@ -524,56 +542,56 @@
 BOOST_AUTO_TEST_CASE(MinMaxComponentsSelector)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   shared_ptr<Data> data = make_shared<Data>("/a");
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/b");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
-  
+
   shared_ptr<Data> data4 = make_shared<Data>("/d");
   data4->setSignature(fakeSignature);
   cs.insert(*data4);
-  
+
   shared_ptr<Data> data5 = make_shared<Data>("/c/c/1/2/3/4/5/6");
   data5->setSignature(fakeSignature);
   cs.insert(*data5);
-  
+
   shared_ptr<Data> data6 = make_shared<Data>("/c/c/6/7/8/9");
   data6->setSignature(fakeSignature);
   cs.insert(*data6);
-  
+
   shared_ptr<Data> data7 = make_shared<Data>("/c/c/1/2/3");
   data7->setSignature(fakeSignature);
   cs.insert(*data7);
-  
+
   shared_ptr<Data> data8 = make_shared<Data>("/c/c/1");
   data8->setSignature(fakeSignature);
   cs.insert(*data8);
-  
+
   shared_ptr<Interest> interest = make_shared<Interest>("/c/c");
   interest->setMinSuffixComponents(3);
   interest->setChildSelector(0);
-  
+
   const Data* found = cs.find(*interest);
   BOOST_CHECK_EQUAL(found->getName(), "/c/c/1/2/3/4/5/6");
 
   shared_ptr<Interest> interest2 = make_shared<Interest>("/c/c");
   interest2->setMinSuffixComponents(4);
   interest2->setChildSelector(1);
-  
+
   const Data* found2 = cs.find(*interest2);
   BOOST_CHECK_EQUAL(found2->getName(), "/c/c/6/7/8/9");
-  
+
   shared_ptr<Interest> interest3 = make_shared<Interest>("/c/c");
   interest3->setMaxSuffixComponents(2);
   interest3->setChildSelector(1);
-  
+
   const Data* found3 = cs.find(*interest3);
   BOOST_CHECK_EQUAL(found3->getName(), "/c/c/1");
 }
@@ -581,22 +599,22 @@
 BOOST_AUTO_TEST_CASE(ExcludeSelector)
 {
   Cs cs;
-  
+
   ndn::SignatureSha256WithRsa fakeSignature;
   fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
-  
+
   shared_ptr<Data> data = make_shared<Data>("/a");
   data->setSignature(fakeSignature);
   cs.insert(*data);
-  
+
   shared_ptr<Data> data2 = make_shared<Data>("/b");
   data2->setSignature(fakeSignature);
   cs.insert(*data2);
-  
+
   shared_ptr<Data> data3 = make_shared<Data>("/c/a");
   data3->setSignature(fakeSignature);
   cs.insert(*data3);
-  
+
   shared_ptr<Data> data4 = make_shared<Data>("/d");
   data4->setSignature(fakeSignature);
   cs.insert(*data4);
@@ -604,37 +622,37 @@
   shared_ptr<Data> data5 = make_shared<Data>("/c/c");
   data5->setSignature(fakeSignature);
   cs.insert(*data5);
-  
+
   shared_ptr<Data> data6 = make_shared<Data>("/c/f");
   data6->setSignature(fakeSignature);
   cs.insert(*data6);
-  
+
   shared_ptr<Data> data7 = make_shared<Data>("/c/n");
   data7->setSignature(fakeSignature);
   cs.insert(*data7);
-  
+
   shared_ptr<Interest> interest = make_shared<Interest>("/c");
   interest->setChildSelector(1);
   Exclude e;
   e.excludeOne (Name::Component("n"));
   interest->setExclude(e);
-  
+
   const Data* found = cs.find(*interest);
   BOOST_CHECK_EQUAL(found->getName(), "/c/f");
 
   shared_ptr<Interest> interest2 = make_shared<Interest>("/c");
   interest2->setChildSelector(0);
-  
+
   Exclude e2;
   e2.excludeOne (Name::Component("a"));
   interest2->setExclude(e2);
 
   const Data* found2 = cs.find(*interest2);
   BOOST_CHECK_EQUAL(found2->getName(), "/c/c");
-  
+
   shared_ptr<Interest> interest3 = make_shared<Interest>("/c");
   interest3->setChildSelector(0);
-  
+
   Exclude e3;
   e3.excludeOne (Name::Component("c"));
   interest3->setExclude(e3);
@@ -654,21 +672,21 @@
     shared_ptr<Data> data = make_shared<Data>(name);
     data->setFreshnessPeriod(time::milliseconds(99999));
     data->setContent(reinterpret_cast<const uint8_t*>(&id), sizeof(id));
-    
+
     ndn::SignatureSha256WithRsa fakeSignature;
     fakeSignature.setValue(ndn::dataBlock(tlv::SignatureValue, reinterpret_cast<const uint8_t*>(0), 0));
     data->setSignature(fakeSignature);
-    
+
     m_cs.insert(*data);
   }
-  
+
   Interest&
   startInterest(const Name& name)
   {
     m_interest = make_shared<Interest>(name);
     return *m_interest;
   }
-  
+
   uint32_t
   find()
   {
@@ -682,7 +700,7 @@
     }
     return *reinterpret_cast<const uint32_t*>(content.value());
   }
-  
+
 protected:
   Cs m_cs;
   shared_ptr<Interest> m_interest;
@@ -693,7 +711,7 @@
 BOOST_AUTO_TEST_CASE(EmptyDataName)
 {
   insert(1, "ndn:/");
-  
+
   startInterest("ndn:/");
   BOOST_CHECK_EQUAL(find(), 1);
 }
@@ -701,7 +719,7 @@
 BOOST_AUTO_TEST_CASE(EmptyInterestName)
 {
   insert(1, "ndn:/A");
-  
+
   startInterest("ndn:/");
   BOOST_CHECK_EQUAL(find(), 1);
 }
@@ -714,7 +732,7 @@
   insert(4, "ndn:/B/q/1");
   insert(5, "ndn:/B/q/2");
   insert(6, "ndn:/C");
-  
+
   startInterest("ndn:/B");
   BOOST_CHECK_EQUAL(find(), 2);
 }
@@ -727,7 +745,7 @@
   insert(4, "ndn:/B/q/1");
   insert(5, "ndn:/B/q/2");
   insert(6, "ndn:/C");
-  
+
   startInterest("ndn:/B")
     .setChildSelector(1);
   BOOST_CHECK_EQUAL(find(), 4);
@@ -740,7 +758,7 @@
   insert(3, "ndn:/A/C");
   insert(4, "ndn:/A");
   insert(5, "ndn:/D");
-  
+
   // Intuitively you would think Data 4 should be between Data 1 and 2,
   // but Data 4 has full Name ndn:/A/<32-octet hash>.
   startInterest("ndn:/A");
@@ -754,7 +772,7 @@
   insert(3, "ndn:/A/BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"); // 33 'B's
   insert(4, "ndn:/A/CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"); // 33 'C's
   insert(5, "ndn:/D");
-  
+
   // Data 2 is returned, because <32-octet hash> is less than Data 3.
   startInterest("ndn:/A");
   BOOST_CHECK_EQUAL(find(), 2);
@@ -768,42 +786,42 @@
   insert(4, "ndn:/D/1");
   insert(5, "ndn:/E");
   insert(6, "ndn:/");
-  
+
   startInterest("ndn:/")
     .setChildSelector(1)
     .setMinSuffixComponents(0);
   BOOST_CHECK_EQUAL(find(), 6);
-  
+
   startInterest("ndn:/")
     .setChildSelector(1)
     .setMinSuffixComponents(1);
   BOOST_CHECK_EQUAL(find(), 6);
-  
+
   startInterest("ndn:/")
     .setChildSelector(1)
     .setMinSuffixComponents(2);
   BOOST_CHECK_EQUAL(find(), 5);
-  
+
   startInterest("ndn:/")
     .setChildSelector(1)
     .setMinSuffixComponents(3);
   BOOST_CHECK_EQUAL(find(), 4);
-  
+
   startInterest("ndn:/")
     .setChildSelector(1)
     .setMinSuffixComponents(4);
   BOOST_CHECK_EQUAL(find(), 3);
-  
+
   startInterest("ndn:/")
     .setChildSelector(1)
     .setMinSuffixComponents(5);
   BOOST_CHECK_EQUAL(find(), 2);
-  
+
   startInterest("ndn:/")
     .setChildSelector(1)
     .setMinSuffixComponents(6);
   BOOST_CHECK_EQUAL(find(), 1);
-  
+
   startInterest("ndn:/")
     .setChildSelector(1)
     .setMinSuffixComponents(7);
@@ -819,31 +837,31 @@
   insert(5, "ndn:/A/B/C/D");
   insert(6, "ndn:/A/B/C/D/E");
   // Order is 6,5,4,3,2,1, because <32-octet hash> is greater than a 1-octet component.
-  
+
   startInterest("ndn:/")
     .setMaxSuffixComponents(0);
   BOOST_CHECK_EQUAL(find(), 0);
-  
+
   startInterest("ndn:/")
     .setMaxSuffixComponents(1);
   BOOST_CHECK_EQUAL(find(), 1);
-  
+
   startInterest("ndn:/")
     .setMaxSuffixComponents(2);
   BOOST_CHECK_EQUAL(find(), 2);
-  
+
   startInterest("ndn:/")
     .setMaxSuffixComponents(3);
   BOOST_CHECK_EQUAL(find(), 3);
-  
+
   startInterest("ndn:/")
     .setMaxSuffixComponents(4);
   BOOST_CHECK_EQUAL(find(), 4);
-  
+
   startInterest("ndn:/")
     .setMaxSuffixComponents(5);
   BOOST_CHECK_EQUAL(find(), 5);
-  
+
   startInterest("ndn:/")
     .setMaxSuffixComponents(6);
   BOOST_CHECK_EQUAL(find(), 6);
@@ -854,15 +872,15 @@
   insert(1, "ndn:/A");
   insert(2, "ndn:/A");
   // We don't know which comes first, but there must be some order
-  
+
   startInterest("ndn:/A")
     .setChildSelector(0);
   uint32_t leftmost = find();
-  
+
   startInterest("ndn:/A")
     .setChildSelector(1);
   uint32_t rightmost = find();
-  
+
   BOOST_CHECK_NE(leftmost, rightmost);
 }
 
@@ -871,13 +889,13 @@
   insert(1, "ndn:/A/B");
   insert(2, "ndn:/A");
   insert(3, "ndn:/A/CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"); // 33 'C's
-  
+
   startInterest("ndn:/A")
     .setExclude(Exclude().excludeBefore(ndn::name::Component(reinterpret_cast<const uint8_t*>(
         "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
         "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"), 31))); // 31 0xFF's
   BOOST_CHECK_EQUAL(find(), 2);
-  
+
   startInterest("ndn:/A")
     .setChildSelector(1)
     .setExclude(Exclude().excludeAfter(ndn::name::Component(reinterpret_cast<const uint8_t*>(
diff --git a/tests/table/fib.cpp b/tests/table/fib.cpp
index a86d5ad..368067d 100644
--- a/tests/table/fib.cpp
+++ b/tests/table/fib.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "table/fib.hpp"
 #include "tests/face/dummy-face.hpp"
diff --git a/tests/table/measurements-accessor.cpp b/tests/table/measurements-accessor.cpp
index caeb6d4..6dc8ff3 100644
--- a/tests/table/measurements-accessor.cpp
+++ b/tests/table/measurements-accessor.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "table/measurements-accessor.hpp"
 #include "fw/strategy.hpp"
diff --git a/tests/table/measurements.cpp b/tests/table/measurements.cpp
index fc95415..3de39ca 100644
--- a/tests/table/measurements.cpp
+++ b/tests/table/measurements.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "table/measurements.hpp"
 
diff --git a/tests/table/name-tree.cpp b/tests/table/name-tree.cpp
index d03f4af..fcf373e 100644
--- a/tests/table/name-tree.cpp
+++ b/tests/table/name-tree.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "table/name-tree.hpp"
 #include "tests/test-common.hpp"
diff --git a/tests/table/pit.cpp b/tests/table/pit.cpp
index 17df2d7..06da611 100644
--- a/tests/table/pit.cpp
+++ b/tests/table/pit.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "table/pit.hpp"
 #include "tests/face/dummy-face.hpp"
diff --git a/tests/table/strategy-choice.cpp b/tests/table/strategy-choice.cpp
index 31df7f0..b382ce3 100644
--- a/tests/table/strategy-choice.cpp
+++ b/tests/table/strategy-choice.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "table/strategy-choice.hpp"
 #include "tests/fw/dummy-strategy.hpp"
diff --git a/tests/table/strategy-info-host.cpp b/tests/table/strategy-info-host.cpp
index b2d1f07..82d4fcc 100644
--- a/tests/table/strategy-info-host.cpp
+++ b/tests/table/strategy-info-host.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #include "table/strategy-info-host.hpp"
 
@@ -21,12 +39,12 @@
   {
     ++g_DummyStrategyInfo_count;
   }
-  
+
   virtual ~DummyStrategyInfo()
   {
     --g_DummyStrategyInfo_count;
   }
-  
+
   int m_id;
 };
 
@@ -35,11 +53,11 @@
 BOOST_AUTO_TEST_CASE(SetGetClear)
 {
   StrategyInfoHost host;
-  
+
   BOOST_CHECK(!static_cast<bool>(host.getStrategyInfo<DummyStrategyInfo>()));
-  
+
   g_DummyStrategyInfo_count = 0;
-  
+
   shared_ptr<DummyStrategyInfo> info = make_shared<DummyStrategyInfo>(7591);
   host.setStrategyInfo(info);
   BOOST_REQUIRE(static_cast<bool>(host.getStrategyInfo<DummyStrategyInfo>()));
@@ -49,7 +67,7 @@
   // host should still have a reference to info
   BOOST_REQUIRE(static_cast<bool>(host.getStrategyInfo<DummyStrategyInfo>()));
   BOOST_CHECK_EQUAL(host.getStrategyInfo<DummyStrategyInfo>()->m_id, 7591);
-  
+
   host.clearStrategyInfo();
   BOOST_CHECK(!static_cast<bool>(host.getStrategyInfo<DummyStrategyInfo>()));
   BOOST_CHECK_EQUAL(g_DummyStrategyInfo_count, 0);
diff --git a/tests/test-common.hpp b/tests/test-common.hpp
index c65d1c2..e9402b2 100644
--- a/tests/test-common.hpp
+++ b/tests/test-common.hpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 #ifndef NFD_TEST_COMMON_HPP
 #define NFD_TEST_COMMON_HPP
diff --git a/tests/test-skeleton.cpp b/tests/test-skeleton.cpp
index acd44ed..259d75f 100644
--- a/tests/test-skeleton.cpp
+++ b/tests/test-skeleton.cpp
@@ -1,8 +1,26 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (C) 2014 Named Data Networking Project
- * See COPYING for copyright and distribution information.
- */
+ * Copyright (c) 2014  Regents of the University of California,
+ *                     Arizona Board of Regents,
+ *                     Colorado State University,
+ *                     University Pierre & Marie Curie, Sorbonne University,
+ *                     Washington University in St. Louis,
+ *                     Beijing Institute of Technology
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ **/
 
 // #include "unit-under-test.hpp"
 // Unit being tested MUST be included first, to ensure header compiles on its own.