diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..a0686d3
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+<enewberry@email.arizona.edu> <enewberry@cs.arizona.edu>
+<git@mail1.yoursunny.com> <sjx@a.integ.ndn-routing.emulab.net>
+<davidepesa@gmail.com> <davide.pesavento@lip6.fr>
+<lybmath2009@gmail.com> <lybmath@ucla.edu>
diff --git a/test_fib_matching/README.md b/test_fib_matching/README.md
index 5db5212..49d5c16 100644
--- a/test_fib_matching/README.md
+++ b/test_fib_matching/README.md
@@ -16,22 +16,16 @@
 3.  Start ndn-traffic-server to serve /A with Content "A" with FreshnessPeriod=10ms.
 4.  Start ndn-traffic-server to serve /A/B/C with Content "C" with FreshnessPeriod=10ms.
 5.  Start ndn-traffic-server to serve /D/E with Content "E" with FreshnessPeriod=10ms.
-6.  Invoke ndn-traffic to request / with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
+6.  Invoke ndn-traffic to request /F with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
 7.  Wait 100ms.
-8.  Invoke ndn-traffic to request /F with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
+8.  Invoke ndn-traffic to request /A with MustBeFresh=true. Fail if unanswered or if received content is not "A".
 9.  Wait 100ms.
-10. Invoke ndn-traffic to request /A with MustBeFresh=true. Fail if unanswered or if received content is not "A".
+10. Invoke ndn-traffic to request /a with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
 11. Wait 100ms.
-12. Invoke ndn-traffic to request /a with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
+12. Invoke ndn-traffic to request /A/B with MustBeFresh=true. Fail if unanswered or if received content is not "A".
 13. Wait 100ms.
-14. Invoke ndn-traffic to request /A/B with MustBeFresh=true. Fail if unanswered or if received content is not "A".
+14. Invoke ndn-traffic to request /A/B/G with MustBeFresh=true. Fail if unanswered or if received content is not "A".
 15. Wait 100ms.
-16. Invoke ndn-traffic to request /A/B/G with MustBeFresh=true. Fail if unanswered or if received content is not "A".
+16. Invoke ndn-traffic to request /A/B/C with MustBeFresh=true. Fail if unanswered or if received content is not "C".
 17. Wait 100ms.
-18. Invoke ndn-traffic to request /A/B/C with MustBeFresh=true. Fail if unanswered or if received content is not "C".
-19. Wait 100ms.
-20. Invoke ndn-traffic to request /A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z with MustBeFresh=true. Fail if unanswered or if received content is not "C".
-21. Wait 100ms.
-22. Invoke ndn-traffic to request /D with MustBeFresh=true and Exclude=[...,D] (... is a zero-length generic component). Fail if unanswered or if received content is not "Z".
-23. Wait 100ms.
-24. Invoke ndn-traffic to request /D with MustBeFresh=true and Exclude=[...,E] (... is a zero-length generic component). Fail if unanswered or if received content is not "Z".
+18. Invoke ndn-traffic to request /A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z with MustBeFresh=true. Fail if unanswered or if received content is not "C".
diff --git a/test_fib_matching/fib-matching-test.sh b/test_fib_matching/fib-matching-test.sh
index eb0dc9e..d313d04 100755
--- a/test_fib_matching/fib-matching-test.sh
+++ b/test_fib_matching/fib-matching-test.sh
@@ -27,8 +27,8 @@
 ndn-traffic-server $workdir/test-traffic-server-4.conf &> $workdir/logs/server-4.log &
 sleep 0.1
 
-# A: Request / with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
-echo "Starting Traffic Client 1 (Prefix=/, MustBeFresh=true, ExpectedContent=Z, MaxSuffixComponents=2)..."
+# A: Request /F with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
+echo "Starting Traffic Client 1 (Prefix=/F, MustBeFresh=true, ExpectedContent=Z)..."
 ndn-traffic -c 1 $workdir/test-traffic-client-1.conf &> $workdir/logs/client-1.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
@@ -41,8 +41,8 @@
 # Sleep for 100ms
 sleep 0.1
 
-# A: Request /F with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
-echo "Starting Traffic Client 2 (Prefix=/F, MustBeFresh=true, ExpectedContent=Z)..."
+# A: Request /A with MustBeFresh=true. Fail if unanswered or if received content is not "A"
+echo "Starting Traffic Client 2 (Prefix=/A, MustBeFresh=true, ExpectedContent=A)..."
 ndn-traffic -c 1 $workdir/test-traffic-client-2.conf &> $workdir/logs/client-2.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
@@ -50,13 +50,13 @@
   clean_up
   exit 1
 fi
-echo "Traffic Client 2 received Data with Content=Z"
+echo "Traffic Client 2 received Data with Content=A"
 
 # Sleep for 100ms
 sleep 0.1
 
-# A: Request /A with MustBeFresh=true. Fail if unanswered or if received content is not "A"
-echo "Starting Traffic Client 3 (Prefix=/A, MustBeFresh=true, ExpectedContent=A)..."
+# A: Request /a with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
+echo "Starting Traffic Client 3 (Prefix=/a, MustBeFresh=true, ExpectedContent=Z)..."
 ndn-traffic -c 1 $workdir/test-traffic-client-3.conf &> $workdir/logs/client-3.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
@@ -64,13 +64,13 @@
   clean_up
   exit 1
 fi
-echo "Traffic Client 3 received Data with Content=A"
+echo "Traffic Client 3 received Data with Content=Z"
 
 # Sleep for 100ms
 sleep 0.1
 
-# A: Request /a with MustBeFresh=true. Fail if unanswered or if received content is not "Z".
-echo "Starting Traffic Client 4 (Prefix=/a, MustBeFresh=true, ExpectedContent=Z)..."
+# A: Request /A/B with MustBeFresh=true. Fail if unanswered or if received content is not "A".
+echo "Starting Traffic Client 4 (Prefix=/A/B, MustBeFresh=true, ExpectedContent=A)..."
 ndn-traffic -c 1 $workdir/test-traffic-client-4.conf &> $workdir/logs/client-4.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
@@ -78,13 +78,13 @@
   clean_up
   exit 1
 fi
-echo "Traffic Client 4 received Data with Content=Z"
+echo "Traffic Client 4 received Data with Content=A"
 
 # Sleep for 100ms
 sleep 0.1
 
-# A: Request /A/B with MustBeFresh=true. Fail if unanswered or if received content is not "A".
-echo "Starting Traffic Client 5 (Prefix=/A/B, MustBeFresh=true, ExpectedContent=A)..."
+# A: Request /A/B/G with MustBeFresh=true. Fail if unanswered or if received content is not "A".
+echo "Starting Traffic Client 5 (Prefix=/A/B/G, MustBeFresh=true, ExpectedContent=A)..."
 ndn-traffic -c 1 $workdir/test-traffic-client-5.conf &> $workdir/logs/client-5.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
@@ -97,8 +97,8 @@
 # Sleep for 100ms
 sleep 0.1
 
-# A: Request /A/B/G with MustBeFresh=true. Fail if unanswered or if received content is not "A".
-echo "Starting Traffic Client 6 (Prefix=/A/B/G, MustBeFresh=true, ExpectedContent=A)..."
+# A: Request /A/B/C with MustBeFresh=true. Fail if unanswered or if received content is not "C".
+echo "Starting Traffic Client 6 (Prefix=/A/B/C, MustBeFresh=true, ExpectedContent=C)..."
 ndn-traffic -c 1 $workdir/test-traffic-client-6.conf &> $workdir/logs/client-6.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
@@ -106,13 +106,14 @@
   clean_up
   exit 1
 fi
-echo "Traffic Client 6 received Data with Content=A"
+echo "Traffic Client 6 received Data with Content=C"
 
 # Sleep for 100ms
 sleep 0.1
 
-# A: Request /A/B/C with MustBeFresh=true. Fail if unanswered or if received content is not "C".
-echo "Starting Traffic Client 7 (Prefix=/A/B/C, MustBeFresh=true, ExpectedContent=C)..."
+# A: Request /A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z with MustBeFresh=true. Fail if unanswered or if received
+# content is not "C".
+echo "Starting Traffic Client 7 (Prefix=/A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z, MustBeFresh=true, ExpectedContent=C)..."
 ndn-traffic -c 1 $workdir/test-traffic-client-7.conf &> $workdir/logs/client-7.log
 outcode=$?
 if [[ $outcode -ne 0 ]]; then
@@ -122,48 +123,4 @@
 fi
 echo "Traffic Client 7 received Data with Content=C"
 
-# Sleep for 100ms
-sleep 0.1
-
-# A: Request /A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z with MustBeFresh=true. Fail if unanswered or if received
-# content is not "C".
-echo "Starting Traffic Client 8 (Prefix=/A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z, MustBeFresh=true, ExpectedContent=C)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-8.conf &> $workdir/logs/client-8.log
-outcode=$?
-if [[ $outcode -ne 0 ]]; then
-  echo "Received non-zero exit code from Traffic Client 8. Actual: $outcode"
-  clean_up
-  exit 1
-fi
-echo "Traffic Client 8 received Data with Content=C"
-
-# Sleep for 100ms
-sleep 0.1
-
-# A: Request /D with MustBeFresh=true and Exclude=[...,D]. Fail if unanswered or if received content
-# is not "Z".
-echo "Starting Traffic Client 9 (Prefix=/D, MustBeFresh=true, ExcludeRange=...,D, ExpectedContent=Z)..."
-ndn-traffic -c 1 $workdir/test-traffic-client-9.conf &> $workdir/logs/client-9.log
-outcode=$?
-if [[ $outcode -ne 0 ]]; then
-  echo "Received non-zero exit code from Traffic Client 9. Actual: $outcode"
-  clean_up
-  exit 1
-fi
-echo "Traffic Client 9 received Data with Content=Z"
-
-# Sleep for 100ms
-sleep 0.1
-
-# A: Request /D with MustBeFresh=true and Exclude=[...,E]. Fail if unanswered or if received content
-# is not "Z".
-echo "Starting Traffic Client 10 (Prefix=/D MustBeFresh=true, ExcludeRange=...,E, ExpectedContent=Z)..."
-outcode=$?
-if [[ $outcode -ne 0 ]]; then
-  echo "Received non-zero exit code from Traffic Client 10. Actual: $outcode"
-  clean_up
-  exit 1
-fi
-echo "Traffic Client 10 received Data with Content=Z"
-
 clean_up
diff --git a/test_fib_matching/test-traffic-client-1.conf b/test_fib_matching/test-traffic-client-1.conf
index ef1884f..7c4f22c 100644
--- a/test_fib_matching/test-traffic-client-1.conf
+++ b/test_fib_matching/test-traffic-client-1.conf
@@ -1,5 +1,4 @@
 TrafficPercentage=100
-Name=ndn:/
+Name=ndn:/F
 MustBeFresh=1
-MaxSuffixComponents=2
 ExpectedContent=Z
diff --git a/test_fib_matching/test-traffic-client-10.conf b/test_fib_matching/test-traffic-client-10.conf
deleted file mode 100644
index 4236460..0000000
--- a/test_fib_matching/test-traffic-client-10.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-TrafficPercentage=100
-Name=ndn:/D
-MustBeFresh=1
-ExcludeRange=...,E
-ExpectedContent=Z
diff --git a/test_fib_matching/test-traffic-client-2.conf b/test_fib_matching/test-traffic-client-2.conf
index 7c4f22c..ebab4a5 100644
--- a/test_fib_matching/test-traffic-client-2.conf
+++ b/test_fib_matching/test-traffic-client-2.conf
@@ -1,4 +1,4 @@
 TrafficPercentage=100
-Name=ndn:/F
+Name=ndn:/A
 MustBeFresh=1
-ExpectedContent=Z
+ExpectedContent=A
diff --git a/test_fib_matching/test-traffic-client-3.conf b/test_fib_matching/test-traffic-client-3.conf
index ebab4a5..6329655 100644
--- a/test_fib_matching/test-traffic-client-3.conf
+++ b/test_fib_matching/test-traffic-client-3.conf
@@ -1,4 +1,4 @@
 TrafficPercentage=100
-Name=ndn:/A
+Name=ndn:/a
 MustBeFresh=1
-ExpectedContent=A
+ExpectedContent=Z
diff --git a/test_fib_matching/test-traffic-client-4.conf b/test_fib_matching/test-traffic-client-4.conf
index 6329655..9ea75b2 100644
--- a/test_fib_matching/test-traffic-client-4.conf
+++ b/test_fib_matching/test-traffic-client-4.conf
@@ -1,4 +1,4 @@
 TrafficPercentage=100
-Name=ndn:/a
+Name=ndn:/A/B
 MustBeFresh=1
-ExpectedContent=Z
+ExpectedContent=A
diff --git a/test_fib_matching/test-traffic-client-5.conf b/test_fib_matching/test-traffic-client-5.conf
index 9ea75b2..302ce02 100644
--- a/test_fib_matching/test-traffic-client-5.conf
+++ b/test_fib_matching/test-traffic-client-5.conf
@@ -1,4 +1,4 @@
 TrafficPercentage=100
-Name=ndn:/A/B
+Name=ndn:/A/B/G
 MustBeFresh=1
 ExpectedContent=A
diff --git a/test_fib_matching/test-traffic-client-6.conf b/test_fib_matching/test-traffic-client-6.conf
index 302ce02..e3b3d84 100644
--- a/test_fib_matching/test-traffic-client-6.conf
+++ b/test_fib_matching/test-traffic-client-6.conf
@@ -1,4 +1,4 @@
 TrafficPercentage=100
-Name=ndn:/A/B/G
+Name=ndn:/A/B/C
 MustBeFresh=1
-ExpectedContent=A
+ExpectedContent=C
diff --git a/test_fib_matching/test-traffic-client-7.conf b/test_fib_matching/test-traffic-client-7.conf
index e3b3d84..c37c7aa 100644
--- a/test_fib_matching/test-traffic-client-7.conf
+++ b/test_fib_matching/test-traffic-client-7.conf
@@ -1,4 +1,4 @@
 TrafficPercentage=100
-Name=ndn:/A/B/C
+Name=ndn:/A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z
 MustBeFresh=1
 ExpectedContent=C
diff --git a/test_fib_matching/test-traffic-client-8.conf b/test_fib_matching/test-traffic-client-8.conf
deleted file mode 100644
index c37c7aa..0000000
--- a/test_fib_matching/test-traffic-client-8.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-TrafficPercentage=100
-Name=ndn:/A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z
-MustBeFresh=1
-ExpectedContent=C
diff --git a/test_fib_matching/test-traffic-client-9.conf b/test_fib_matching/test-traffic-client-9.conf
deleted file mode 100644
index c054149..0000000
--- a/test_fib_matching/test-traffic-client-9.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-TrafficPercentage=100
-Name=ndn:/D
-MustBeFresh=1
-ExcludeRange=...,D
-ExpectedContent=Z
diff --git a/test_fib_matching/test_fib_matching.py b/test_fib_matching/test_fib_matching.py
index afa23ed..1d7ec25 100644
--- a/test_fib_matching/test_fib_matching.py
+++ b/test_fib_matching/test_fib_matching.py
@@ -24,10 +24,10 @@
         os.chdir("..")
 
     def test_fib_matching(self):
-        ret = subprocess.call(["./fib-matching-test.sh"], shell=True)
+        ret = subprocess.call(["./fib-matching-test.sh"])
         print "Test script return value:", ret
         errormsg = {
-            1 : "Traffic Client did not receive a Data or received Data did not contain expected content",
+            1 : "Traffic Client did not receive Data or received Data did not contain expected content",
         }
-        if (ret != 0):
+        if ret != 0:
             self.fail(errormsg[ret])