diff --git a/tests/main.cc b/tests/main.cc
index 6b0a14a..1af6df7 100644
--- a/tests/main.cc
+++ b/tests/main.cc
@@ -1,10 +1,20 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2013, Regents of the University of California
+ * Copyright (c) 2012-2014 University of California, Los Angeles
  *
- * BSD license, See the LICENSE file for more information
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
  *
- * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * ChronoSync 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.
+ *
+ * ChronoSync 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
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #define BOOST_TEST_MAIN 1
diff --git a/tests/test-data-fetch-and-publish.cc b/tests/test-data-fetch-and-publish.cc
index c1eb5df..583717c 100644
--- a/tests/test-data-fetch-and-publish.cc
+++ b/tests/test-data-fetch-and-publish.cc
@@ -1,28 +1,25 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012 University of California, Los Angeles
+ * Copyright (c) 2012-2014 University of California, Los Angeles
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
  *
- * This program 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.
+ * ChronoSync 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ChronoSync 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.
  *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Chaoyi Bian <bcy@pku.edu.cn>
- *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
 #include <boost/test/unit_test.hpp>
-#include <boost/test/output_test_stream.hpp> 
+#include <boost/test/output_test_stream.hpp>
 #include <map>
 using boost::test_tools::output_test_stream;
 
@@ -48,7 +45,7 @@
   }
 
   string toString(){
-    map<string, string>::iterator it = data.begin(); 
+    map<string, string>::iterator it = data.begin();
     string str = "";
     for (; it != data.end(); ++it){
       str += "<";
@@ -66,7 +63,7 @@
 {
   TestStructApp foo;
   TestStructApp bar;
-	
+
   string interest = "/april/fool";
   string seq[5] = {"0", "1", "2", "3", "4" };
   string str[5] = {"panda", "express", "tastes", "so", "good"};
diff --git a/tests/test-digest.cc b/tests/test-digest.cc
index 4815919..cbc5ced 100644
--- a/tests/test-digest.cc
+++ b/tests/test-digest.cc
@@ -1,27 +1,24 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012 University of California, Los Angeles
+ * Copyright (c) 2012-2014 University of California, Los Angeles
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
  *
- * This program 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.
+ * ChronoSync 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ChronoSync 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.
  *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Chaoyi Bian <bcy@pku.edu.cn>
- *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/output_test_stream.hpp> 
+#include <boost/test/output_test_stream.hpp>
 using boost::test_tools::output_test_stream;
 
 #include "sync-digest.h"
@@ -51,13 +48,13 @@
 
   // fix hash
   d1.finalize ();
-  
+
   BOOST_CHECK_NO_THROW (d1.getHash ());
   BOOST_CHECK (!d1.empty ());
   BOOST_CHECK (d1 == d1);
 
   BOOST_CHECK_THROW (d1 << "2", DigestCalculationError);
-  
+
   output_test_stream output;
   BOOST_CHECK_NO_THROW (output << d1);
   // BOOST_CHECK (output.check_length (40, false) );
@@ -73,12 +70,12 @@
   // BOOST_CHECK_THROW (d1 == d1, DigestCalculationError);
   BOOST_CHECK_NO_THROW (d1.finalize ());
   BOOST_CHECK (d1 == d1);
-  
+
   Digest d2;
   BOOST_CHECK_NO_THROW (d2 << "2\n");
   BOOST_CHECK_NO_THROW (d2.finalize ());
   BOOST_CHECK (d1 != d2);
-  
+
   Digest d3;
   // istringstream is (string ("e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e")); // real sha-1 for "1\n"
 	istringstream is (string ("4355a46b19d348dc2f57c046f8ef63d4538ebb936000f3c9ee954a27460dd865")); // real sha256 for "1\n"
@@ -95,7 +92,7 @@
 
   istringstream is3 (string ("25fa44f2b31c1fb553b6021e7360d07d5d91ff5e")); // some fake hash
   BOOST_CHECK_NO_THROW (is3 >> d4);
-  
+
   BOOST_CHECK (d4 != d1);
   BOOST_CHECK (d4 != d2);
   BOOST_CHECK (d4 != d3);
diff --git a/tests/test-interest-table.cc b/tests/test-interest-table.cc
index 9f31551..b5085c7 100644
--- a/tests/test-interest-table.cc
+++ b/tests/test-interest-table.cc
@@ -1,27 +1,24 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012 University of California, Los Angeles
+ * Copyright (c) 2012-2014 University of California, Los Angeles
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
  *
- * This program 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.
+ * ChronoSync 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ChronoSync 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.
  *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Chaoyi Bian <bcy@pku.edu.cn>
- *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/output_test_stream.hpp> 
+#include <boost/test/output_test_stream.hpp>
 #include <map>
 using boost::test_tools::output_test_stream;
 
@@ -37,10 +34,9 @@
 {
   // Alex: test is broken due to changes in SyncInterestTable
   cerr << "InterestTableTest is broken" << endl;
-  
+
   // SyncInterestTable *table = 0;
   // BOOST_CHECK_NO_THROW (table = new SyncInterestTable ());
 
   // BOOST_CHECK_NO_THROW (delete table);
 }
-
diff --git a/tests/test-leaf.cc b/tests/test-leaf.cc
index 49afcc5..bad1971 100644
--- a/tests/test-leaf.cc
+++ b/tests/test-leaf.cc
@@ -1,27 +1,24 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012 University of California, Los Angeles
+ * Copyright (c) 2012-2014 University of California, Los Angeles
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
  *
- * This program 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.
+ * ChronoSync 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ChronoSync 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.
  *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Chaoyi Bian <bcy@pku.edu.cn>
- *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/output_test_stream.hpp> 
+#include <boost/test/output_test_stream.hpp>
 using boost::test_tools::output_test_stream;
 
 #include <boost/make_shared.hpp>
@@ -47,7 +44,7 @@
 
   BOOST_CHECK_NO_THROW (DiffLeaf x (name, SeqNo (12)));
   BOOST_CHECK_EQUAL (name.use_count (), 1);
-  
+
   BOOST_CHECK_NO_THROW (DiffLeaf x (name));
   BOOST_CHECK_EQUAL (name.use_count (), 1);
 
@@ -60,11 +57,11 @@
   BOOST_CHECK_EQUAL (updateLeaf.getOperation (), UPDATE);
   BOOST_CHECK_EQUAL (updateLeaf.getSeq ().getSession (), 0);
   BOOST_CHECK_EQUAL (updateLeaf.getSeq ().getSeq (), 12);
-  
+
   BOOST_CHECK_EQUAL (removeLeaf.getOperation (), REMOVE);
   BOOST_CHECK_EQUAL (removeLeaf.getSeq ().getSession (), 0);
   BOOST_CHECK_EQUAL (removeLeaf.getSeq ().getSeq (), 0);
-  
+
   BOOST_REQUIRE_NO_THROW (FullLeaf x (name, SeqNo (12)));
   FullLeaf fullLeaf (name, SeqNo (12));
   BOOST_CHECK_EQUAL (name.use_count (), 4);
@@ -77,7 +74,7 @@
   FullLeaf fullLeaf (name, SeqNo (12));
 
   // fullLeafDigest = hash ( hash(name), hash (session, seqNo) )
-  
+
   // Digest manualDigest;
 
   // Digest manualNameDigest;
diff --git a/tests/test-pit.cc b/tests/test-pit.cc
index 5e48180..39b36b9 100644
--- a/tests/test-pit.cc
+++ b/tests/test-pit.cc
@@ -1,27 +1,24 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012 University of California, Los Angeles
+ * Copyright (c) 2012-2014 University of California, Los Angeles
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
  *
- * This program 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.
+ * ChronoSync 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ChronoSync 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.
  *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Chaoyi Bian <bcy@pku.edu.cn>
- *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/output_test_stream.hpp> 
+#include <boost/test/output_test_stream.hpp>
 using boost::test_tools::output_test_stream;
 #include <vector>
 
@@ -48,7 +45,7 @@
 BOOST_AUTO_TEST_CASE (SyncInterestTableTest)
 {
   cerr << "SyncInterestTableTest is broken" << endl;
-  
+
   // INIT_LOGGERS ();
   // INIT_LOGGER ("Test.Pit");
 
@@ -73,5 +70,3 @@
   // str = sitToString(&sit);
   // BOOST_CHECK_EQUAL(str, "/ucla.edu/2/ucla.edu/0");
 }
-
-
diff --git a/tests/test-scheduler.cc.tmp b/tests/test-scheduler.cc.tmp
index 0d67417..2a53a22 100644
--- a/tests/test-scheduler.cc.tmp
+++ b/tests/test-scheduler.cc.tmp
@@ -1,27 +1,24 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012 University of California, Los Angeles
+ * Copyright (c) 2012-2014 University of California, Los Angeles
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
  *
- * This program 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.
+ * ChronoSync 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ChronoSync 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.
  *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Chaoyi Bian <bcy@pku.edu.cn>
- *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/output_test_stream.hpp> 
+#include <boost/test/output_test_stream.hpp>
 #include <map>
 using boost::test_tools::output_test_stream;
 
@@ -58,7 +55,7 @@
   {}
 
   int counter;
-  
+
   Scheduler *scheduler;
 
   void everySecond ()
@@ -112,7 +109,7 @@
 
   this_thread::sleep (posix_time::milliseconds (500));
   BOOST_CHECK_EQUAL (counter, 9); // still 9
-  
+
   this_thread::sleep (posix_time::milliseconds (200));
   BOOST_CHECK_EQUAL (counter, 3);
 
@@ -126,7 +123,7 @@
   scheduler->cancel (ANOTHER_LABEL);
   this_thread::sleep (posix_time::milliseconds (150));
   BOOST_CHECK_EQUAL (counter, 5);
-  
+
   BOOST_CHECK_NO_THROW (delete scheduler);
 }
 
@@ -146,7 +143,7 @@
 }
 
 BOOST_AUTO_TEST_CASE (SyncLogicSchedulerTest)
-{  
+{
   SyncLogic *logic = 0;
   BOOST_CHECK_NO_THROW (logic = new SyncLogic ("/prefix", funcPass, funcRemove));
   this_thread::sleep (posix_time::milliseconds (100));
@@ -154,24 +151,24 @@
   Scheduler &scheduler = logic->getScheduler ();
   BOOST_CHECK_EQUAL (scheduler.getEventsSize (), 1);
 
-  BOOST_CHECK_NO_THROW (logic->respondSyncInterest ("/prefix/e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e")); 
+  BOOST_CHECK_NO_THROW (logic->respondSyncInterest ("/prefix/e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e"));
   BOOST_CHECK_EQUAL (scheduler.getEventsSize (), 2);
 
   this_thread::sleep (posix_time::milliseconds (100)); // max waiting time
   BOOST_CHECK_EQUAL (scheduler.getEventsSize (), 1);
 
-  BOOST_CHECK_NO_THROW (logic->respondSyncInterest ("/prefix/e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e")); 
-  BOOST_CHECK_NO_THROW (logic->respondSyncInterest ("/prefix/e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e")); 
-  BOOST_CHECK_NO_THROW (logic->respondSyncInterest ("/prefix/e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e")); 
   BOOST_CHECK_NO_THROW (logic->respondSyncInterest ("/prefix/e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e"));
-  BOOST_CHECK_EQUAL (scheduler.getEventsSize (), 5);  
+  BOOST_CHECK_NO_THROW (logic->respondSyncInterest ("/prefix/e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e"));
+  BOOST_CHECK_NO_THROW (logic->respondSyncInterest ("/prefix/e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e"));
+  BOOST_CHECK_NO_THROW (logic->respondSyncInterest ("/prefix/e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e"));
+  BOOST_CHECK_EQUAL (scheduler.getEventsSize (), 5);
 
   this_thread::sleep (posix_time::milliseconds (19)); // min waiting time is 20
-  BOOST_CHECK_EQUAL (scheduler.getEventsSize (), 5);  
+  BOOST_CHECK_EQUAL (scheduler.getEventsSize (), 5);
 
   this_thread::sleep (posix_time::milliseconds (100)); // max waiting time
   BOOST_CHECK_EQUAL (scheduler.getEventsSize (), 1);
-  
+
   BOOST_CHECK_NO_THROW (delete logic);
 }
 
diff --git a/tests/test-socket.cc b/tests/test-socket.cc
index 2c0d216..d04ded9 100644
--- a/tests/test-socket.cc
+++ b/tests/test-socket.cc
@@ -1,23 +1,20 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012 University of California, Los Angeles
+ * Copyright (c) 2012-2014 University of California, Los Angeles
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
  *
- * This program 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.
+ * ChronoSync 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ChronoSync 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.
  *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Chaoyi Bian <bcy@pku.edu.cn>
- *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <boost/test/unit_test.hpp>
diff --git a/tests/test-state.cc.outdated b/tests/test-state.cc.outdated
index 35fc79c..433f8d9 100644
--- a/tests/test-state.cc.outdated
+++ b/tests/test-state.cc.outdated
@@ -1,30 +1,27 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012 University of California, Los Angeles
+ * Copyright (c) 2012-2014 University of California, Los Angeles
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
  *
- * This program 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.
+ * ChronoSync 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ChronoSync 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.
  *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Chaoyi Bian <bcy@pku.edu.cn>
- *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #define BOOST_TEST_DYN_LINK 1
 #define BOOST_TEST_NO_MAIN 1
 // #define BOOST_TEST_MODULE StateTests
 #include <boost/test/unit_test.hpp>
-#include <boost/test/output_test_stream.hpp> 
+#include <boost/test/output_test_stream.hpp>
 using boost::test_tools::output_test_stream;
 
 #include <boost/make_shared.hpp>
@@ -127,7 +124,7 @@
   name3.reset (); // force destructor
   name3 = StdNameInfo::FindOrCreate ("3"); // this will enforce different (larger) hashing ID of name
   name2 = StdNameInfo::FindOrCreate ("2"); // this will enforce different (larger) hashing ID of name
-  
+
   // adding in different order
   state.update (name3, SeqNo (8));
   state.update (name2, SeqNo (12));
@@ -145,7 +142,7 @@
 
   state.update (name1, SeqNo (10));
   state.update (name2, SeqNo (12));
-  state.update (name3, SeqNo (8));  
+  state.update (name3, SeqNo (8));
 
   string xml1 = "<state>"
     "<item><name>1</name><seq><session>0</session><seqno>10</seqno></seq></item>"
@@ -156,11 +153,11 @@
   ostringstream os;
   os << state;
   string s = os.str ();
-  // cout << s << endl; 
+  // cout << s << endl;
   erase_all (s, "\n");
   BOOST_CHECK_EQUAL (s, xml1);
   }
-  
+
   state.remove (name2);
   string xml2 = "<state>"
     "<item><name>1</name><seq><session>0</session><seqno>10</seqno></seq></item>"
@@ -184,10 +181,10 @@
   erase_all (xml1_test, "\n");
   BOOST_CHECK_EQUAL (xml1_test, xml1);
   }
-  
+
   istringstream xml2_is ("<state><item action=\"remove\"><name>2</name></item></state>");
   BOOST_CHECK_NO_THROW (xml2_is >> state2);
-  
+
   {
   ostringstream os;
   os << state2;
@@ -207,7 +204,7 @@
 
   state.update (name1, SeqNo (10));
   state.update (name2, SeqNo (12));
-  state.update (name3, SeqNo (8));  
+  state.update (name3, SeqNo (8));
 
   string xml1 = "<state>"
     "<item action=\"update\"><name>1</name><seq><session>0</session><seqno>10</seqno></seq></item>"
@@ -221,7 +218,7 @@
   erase_all (xml1_test, "\n");
   BOOST_CHECK_EQUAL (xml1_test, xml1);
   }
-  
+
   state.remove (name2);
   string xml2 = "<state>"
     "<item action=\"update\"><name>1</name><seq><session>0</session><seqno>10</seqno></seq></item>"
@@ -237,11 +234,11 @@
   }
 
   ////////////  ////////////  ////////////  ////////////  ////////////  ////////////
-  
+
   DiffState state2;
   istringstream xml1_is (xml1);
   BOOST_CHECK_NO_THROW (xml1_is >> state2);
-  
+
   {
   ostringstream os;
   os << state2;
@@ -252,7 +249,7 @@
 
   istringstream xml2_is ("<state><item action=\"remove\"><name>2</name></item></state>");
   BOOST_CHECK_NO_THROW (xml2_is >> state2);
-  
+
   {
   ostringstream os;
   os << state2;
@@ -269,14 +266,14 @@
 
   DiffStatePtr head = make_shared<DiffState> ();
   root->setNext (head);
-  
+
   head->update (StdNameInfo::FindOrCreate ("3"), SeqNo (1));
   head->remove (StdNameInfo::FindOrCreate ("1"));
-  
+
   DiffStatePtr tail = make_shared<DiffState> ();
   head->setNext (tail);
 
-  tail->update (StdNameInfo::FindOrCreate ("3"), SeqNo (2));  
+  tail->update (StdNameInfo::FindOrCreate ("3"), SeqNo (2));
 
   {
   ostringstream os;
diff --git a/tests/test-sync-logic.cc b/tests/test-sync-logic.cc
index 84a28cb..6c5c1fd 100644
--- a/tests/test-sync-logic.cc
+++ b/tests/test-sync-logic.cc
@@ -1,23 +1,20 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012 University of California, Los Angeles
+ * Copyright (c) 2012-2014 University of California, Los Angeles
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
  *
- * This program 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.
+ * ChronoSync 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.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * ChronoSync 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.
  *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Chaoyi Bian <bcy@pku.edu.cn>
- *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <boost/test/unit_test.hpp>
diff --git a/tests/test-sync-validator.cc b/tests/test-sync-validator.cc
index a96c0bd..7c8c300 100644
--- a/tests/test-sync-validator.cc
+++ b/tests/test-sync-validator.cc
@@ -1,6 +1,20 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012 University of California, Los Angeles
+ * Copyright (c) 2012-2014 University of California, Los Angeles
+ *
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
+ *
+ * ChronoSync 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.
+ *
+ * ChronoSync 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
+ * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <boost/test/unit_test.hpp>