Various fixes for NFD/ndn-cxx 0.7.0

Change-Id: I68e5d4d57d81c3f2e46fc59680cd416b06c8190c
diff --git a/tests/unit-tests/helper/ndn-link-control-helper.t.cpp b/tests/unit-tests/helper/ndn-link-control-helper.t.cpp
index 3d79ffa..0df5280 100644
--- a/tests/unit-tests/helper/ndn-link-control-helper.t.cpp
+++ b/tests/unit-tests/helper/ndn-link-control-helper.t.cpp
@@ -55,17 +55,17 @@
   Simulator::Schedule(Seconds(10.1), ndn::LinkControlHelper::UpLink, getNode("1"), getNode("2"));
 
   nfd::getScheduler().schedule(time::milliseconds(5200), [&] {
-      BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 6);
-      BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 6);
+      BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 5);
+      BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 5);
     });
 
   nfd::getScheduler().schedule(time::milliseconds(10200), [&] {
-      BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 6);
-      BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 6);
+      BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 5);
+      BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 5);
     });
   nfd::getScheduler().schedule(time::milliseconds(15100), [&] {
-      BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 11);
-      BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 11);
+      BOOST_CHECK_EQUAL(getFace("2", "1")->getCounters().nInInterests, 10);
+      BOOST_CHECK_EQUAL(getFace("1", "2")->getCounters().nInData, 10);
     });
 
   Simulator::Stop(Seconds(15.2));