diff --git a/tests/publisher/publisher-fixture.hpp b/tests/publisher/publisher-fixture.hpp
index 05e5a0f..840de0b 100644
--- a/tests/publisher/publisher-fixture.hpp
+++ b/tests/publisher/publisher-fixture.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2018,  The University of Memphis,
+ * Copyright (c) 2014-2019,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
  *
@@ -46,14 +46,13 @@
 public:
   PublisherFixture()
     : face(m_ioService, m_keyChain, {true, true})
-    , nlsr(m_ioService, m_scheduler, face, m_keyChain)
-    , lsdb(nlsr.getLsdb())
-    , rt1(nlsr.getRoutingTable())
+    , conf(face)
+    , confProcessor(conf)
+    , nlsr(face, m_keyChain, conf)
+    , lsdb(nlsr.m_lsdb)
+    , rt1(nlsr.m_routingTable)
   {
-    nlsr.getConfParameter().setNetwork("/ndn");
-    nlsr.getConfParameter().setRouterName("/This/Router");
-
-    routerId = addIdentity("/ndn/This/Router");
+    routerId = addIdentity(conf.getRouterPrefix());
 
     nlsr.initialize();
     face.processEvents(ndn::time::milliseconds(100));
@@ -178,7 +177,8 @@
 
 public:
   ndn::util::DummyClientFace face;
-
+  ConfParameter conf;
+  DummyConfFileProcessor confProcessor;
   Nlsr nlsr;
   Lsdb& lsdb;
 
diff --git a/tests/publisher/test-dataset-interest-handler.cpp b/tests/publisher/test-dataset-interest-handler.cpp
index 7083b82..ee96ba8 100644
--- a/tests/publisher/test-dataset-interest-handler.cpp
+++ b/tests/publisher/test-dataset-interest-handler.cpp
@@ -107,17 +107,16 @@
       return block.type() == ndn::tlv::nlsr::RoutingTable; });
 }
 
-
 BOOST_AUTO_TEST_CASE(Routername)
 {
-  ndn::Name regRouterPrefix(nlsr.getConfParameter().getRouterPrefix());
+  ndn::Name regRouterPrefix(conf.getRouterPrefix());
   regRouterPrefix.append("nlsr");
   // Should already be added to dispatcher
-  BOOST_CHECK_THROW(nlsr.getDispatcher().addTopPrefix(regRouterPrefix), std::out_of_range);
+  BOOST_CHECK_THROW(nlsr.m_dispatcher.addTopPrefix(regRouterPrefix), std::out_of_range);
 
   checkPrefixRegistered(regRouterPrefix);
 
-  //Install adjacencies LSA
+  // Install adjacencies LSA
   AdjLsa adjLsa;
   adjLsa.setOrigRouter("/RouterA");
   addAdjacency(adjLsa, "/RouterA/adjacency1", "udp://face-1", 10);
@@ -125,11 +124,11 @@
 
   std::vector<double> angles = {20.00, 30.00};
 
-  //Install coordinate LSA
+  // Install coordinate LSA
   CoordinateLsa coordinateLsa = createCoordinateLsa("/RouterA", 10.0, angles);
   lsdb.installCoordinateLsa(coordinateLsa);
 
-  //Install routing table
+  // Install routing table
   RoutingTableEntry rte1("desrouter1");
   const ndn::Name& DEST_ROUTER = rte1.getDestination();
 
@@ -137,23 +136,26 @@
 
   rt1.addNextHop(DEST_ROUTER, nh);
 
+  ndn::Name routerName(conf.getRouterPrefix());
+  routerName.append("nlsr");
+
   // Request adjacency LSAs
-  face.receive(ndn::Interest("/ndn/This/Router/nlsr/lsdb/adjacencies").setCanBePrefix(true));
+  face.receive(ndn::Interest(ndn::Name(routerName).append("lsdb").append("adjacencies")).setCanBePrefix(true));
   processDatasetInterest(face,
     [] (const ndn::Block& block) { return block.type() == ndn::tlv::nlsr::AdjacencyLsa; });
 
   // Request coordinate LSAs
-  face.receive(ndn::Interest("/ndn/This/Router/nlsr/lsdb/coordinates").setCanBePrefix(true));
+  face.receive(ndn::Interest(ndn::Name(routerName).append("lsdb").append("coordinates")).setCanBePrefix(true));
   processDatasetInterest(face,
     [] (const ndn::Block& block) { return block.type() == ndn::tlv::nlsr::CoordinateLsa; });
 
   // Request Name LSAs
-  face.receive(ndn::Interest("/ndn/This/Router/nlsr/lsdb/names").setCanBePrefix(true));
+  face.receive(ndn::Interest(ndn::Name(routerName).append("lsdb").append("names")).setCanBePrefix(true));
   processDatasetInterest(face,
     [] (const ndn::Block& block) { return block.type() == ndn::tlv::nlsr::NameLsa; });
 
   // Request Routing Table
-  face.receive(ndn::Interest("/ndn/This/Router/nlsr/routing-table").setCanBePrefix(true));
+  face.receive(ndn::Interest(ndn::Name(routerName).append("routing-table")));
   processDatasetInterest(face,
     [] (const ndn::Block& block) {
       return block.type() == ndn::tlv::nlsr::RoutingTable; });