diff --git a/test_hub_discovery/hub-discovery-test.sh b/test_hub_discovery/hub-discovery-test.sh
index 5d50070..861dc8a 100755
--- a/test_hub_discovery/hub-discovery-test.sh
+++ b/test_hub_discovery/hub-discovery-test.sh
@@ -35,21 +35,21 @@
 
 sleep 2
 
-ssh $IP4_B1 "$workdir/test-B-stage1.sh $workdir"
+ssh $CTRL_B "$workdir/test-B-stage1.sh $workdir"
 if [[ $? -ne 0 ]]; then
   echo "Stage 1: multicast discovery failed on node B" >> $testLog
   clean_up
   exit 1
 fi
 
-ssh $IP4_D1 "$workdir/test-D-stage2.sh $workdir"
+ssh $CTRL_D "$workdir/test-D-stage2.sh $workdir"
 if [[ $? -ne 0 ]]; then
   echo "Stage 2: DNS query with default suffix failed on node D" >> $testLog
   clean_up
 exit 1
 fi
 
-ssh $IP4_D1 "$workdir/test-D-stage3.sh $workdir"
+ssh $CTRL_D "$workdir/test-D-stage3.sh $workdir"
 if [[ $? -ne 0 ]]; then
   echo "Stage 3: find home router failed on node D" >> $testLog
   clean_up
diff --git a/test_interest_loop/interest-loop-test.sh b/test_interest_loop/interest-loop-test.sh
index f917a06..7d0a81f 100755
--- a/test_interest_loop/interest-loop-test.sh
+++ b/test_interest_loop/interest-loop-test.sh
@@ -17,6 +17,10 @@
     r=$(ssh $b_ipaddr "sudo killall nfd 2>&1" 2>&1)
     r=$(ssh $c_ipaddr "sudo killall nfd 2>&1" 2>&1)
 }
+# generate nfd.conf: disable multicast faces
+cp /usr/local/etc/ndn/nfd.conf $workdir/nfd.conf
+ssh $CTRL_B "sed 's/mcast yes/mcast no/' /usr/local/etc/ndn/nfd.conf > $workdir/nfd.conf"
+ssh $CTRL_C "sed 's/mcast yes/mcast no/' /usr/local/etc/ndn/nfd.conf > $workdir/nfd.conf"
 
 # get keys
 echo "getting keys..."
diff --git a/test_interest_loop/nfd.conf b/test_interest_loop/nfd.conf
deleted file mode 100644
index 7c16261..0000000
--- a/test_interest_loop/nfd.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-log
-{
-}
-
-face_system
-{
-  unix
-  {
-    listen yes
-    path /var/run/nfd.sock
-  }
-
-  tcp
-  {
-    listen yes
-    port 6363
-  }
-
-  udp
-  {
-    port 6363
-    idle_timeout 600
-    keep_alive_interval 25
-
-    mcast no ; Turn off UDP multicast.
-  }
-
-  ether
-  {
-    mcast no ; Turn off Ethernet multicast.
-  }
-}
-
-authorizations
-{
-  authorize
-  {
-    certfile keys/default.ndncert
-    privileges
-    {
-      faces
-      fib
-      strategy-choice
-    }
-  }
-}
diff --git a/test_localhost_scope/in-master.sh b/test_localhost_scope/in-master.sh
index 4ddd489..a247492 100755
--- a/test_localhost_scope/in-master.sh
+++ b/test_localhost_scope/in-master.sh
@@ -21,7 +21,7 @@
 
 # set up socat on A
 socat -v UNIX-LISTEN:/tmp/localhost-test-B.sock,fork TCP:$IP4_B1:6363 &> logs/socat.log &
-echo "unix_socket=/tmp/localhost-test-B.sock" > $HOME/.ndn/client.conf
+echo "transport=unix:///tmp/localhost-test-B.sock" > $HOME/.ndn/client.conf
 sleep 1
 
 # send interest