diff --git a/tests/test-case.t.cpp.sample b/tests/test-case.t.cpp.sample
index 084b905..bfff444 100644
--- a/tests/test-case.t.cpp.sample
+++ b/tests/test-case.t.cpp.sample
@@ -1,12 +1,12 @@
 /* -*- 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,
- *                      The University of Memphis
+/*
+ * Copyright (c) 2014-2018,  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,
+ *                           The University of Memphis.
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -24,15 +24,15 @@
  */
 
 // #include "unit-under-test.hpp"
-// Unit being tested MUST be included first, to ensure header compiles on its own.
+// The unit being tested MUST be included first, to ensure the header compiles on its own.
 // For further information about test naming conventions, see
-// http://redmine.named-data.net/projects/nfd/wiki/UnitTesting
+// https://redmine.named-data.net/projects/nfd/wiki/UnitTesting
 
 #include "tests/test-common.hpp"
 
+// Unit tests SHOULD go inside nfd::tests namespace.
 namespace nfd {
 namespace tests {
-// Unit tests SHOULD go inside nfd::tests namespace.
 
 // Test suite SHOULD use BaseFixture or a subclass of it.
 BOOST_FIXTURE_TEST_SUITE(TestSkeleton, BaseFixture)
@@ -44,8 +44,8 @@
   // For reference of available Boost.Test macros, see
   // http://www.boost.org/doc/libs/1_54_0/libs/test/doc/html/utf/testing-tools/reference.html
 
-  BOOST_REQUIRE_NO_THROW(i = 1);
-  BOOST_REQUIRE_EQUAL(i, 1);
+  BOOST_CHECK_EQUAL(i, 0);
+  BOOST_CHECK_GT(++i, 0);
 }
 
 // Custom fixture SHOULD derive from BaseFixture.
@@ -55,8 +55,8 @@
 
 BOOST_FIXTURE_TEST_CASE(Test2, Test2Fixture)
 {
-  // g_io is a shorthand of getGlobalIoService()
-  // resetGlobalIoService() is automatically called after each test case
+  // g_io is a shorthand of getGlobalIoService().
+  // resetGlobalIoService() is automatically called after each test case.
   g_io.run();
 }