Various fixes for NFD/ndn-cxx 0.7.0

Change-Id: I68e5d4d57d81c3f2e46fc59680cd416b06c8190c
diff --git a/tests/unit-tests/ndn-cxx/face.t.cpp b/tests/unit-tests/ndn-cxx/face.t.cpp
index 32a1c1c..98d880b 100644
--- a/tests/unit-tests/ndn-cxx/face.t.cpp
+++ b/tests/unit-tests/ndn-cxx/face.t.cpp
@@ -230,7 +230,7 @@
 
 private:
   ::ndn::Scheduler m_scheduler;
-  ::ndn::util::scheduler::ScopedEventId m_event;
+  ::ndn::scheduler::ScopedEventId m_event;
 };
 
 BOOST_AUTO_TEST_CASE(ExpressMultipleInterests)