tlv: Another set of changes to update TLV type re-assignment

Change-Id: Ia26fb0a8b30ce98bfe0184950fb975b0029fea2d
diff --git a/tests/management/test-ndnd-forwarding-entry.cpp b/tests/management/test-ndnd-forwarding-entry.cpp
index 7e2066b..1c1afb8 100644
--- a/tests/management/test-ndnd-forwarding-entry.cpp
+++ b/tests/management/test-ndnd-forwarding-entry.cpp
@@ -20,7 +20,11 @@
 namespace ndn {
 namespace ndnd {
 
-const uint8_t FORWARDING_ENTRY[] = {0x81, 0x19, 0x83, 0x07, 0x73, 0x65, 0x6c, 0x66, 0x72, 0x65, 0x67, 0x01, 0x0b, 0x02, 0x01, 0x61, 0x02, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x8a, 0x01, 0x03};
+const uint8_t FORWARDING_ENTRY[] = {0x81, 0x19, 0x83, 0x07, 0x73, 0x65, 0x6c, 0x66, 0x72, 0x65, 0x67,
+                                      0x07, 0x0b,
+                                        0x08, 0x01, 0x61,
+                                        0x08, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78,
+                                      0x8a, 0x01, 0x03};
 
 BOOST_AUTO_TEST_SUITE(TestForwardingEntry)
 
diff --git a/tests/management/test-nfd-control.cpp b/tests/management/test-nfd-control.cpp
index 735ba18..c41844a 100644
--- a/tests/management/test-nfd-control.cpp
+++ b/tests/management/test-nfd-control.cpp
@@ -18,11 +18,14 @@
 
 BOOST_AUTO_TEST_SUITE(TestNfdControl)
 
-const uint8_t TestControlResponse[] = {0x65, 0x17, 0x66, 0x02, 0x01, 0x94, 0x67, 0x11, 0x4e, 0x6f, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64};
+const uint8_t TestControlResponse[] = {0x65, 0x17,
+                                         0x66, 0x02, 0x01, 0x94, 0x67, 0x11, 0x4e, 0x6f, 0x74,
+                                         0x68, 0x69, 0x6e, 0x67, 0x20, 0x6e, 0x6f, 0x74, 0x20,
+                                         0x66, 0x6f, 0x75, 0x6e, 0x64};
 
 const uint8_t TestFibManagementOptions[] = {
-  0x68, 0x1e, 0x01, 0x16, 0x02, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68,
-  0x6f, 0x73, 0x74, 0x02, 0x03, 0x72, 0x65, 0x67, 0x02, 0x04, 0x74, 0x65,
+  0x68, 0x1e, 0x07, 0x16, 0x08, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68,
+  0x6f, 0x73, 0x74, 0x08, 0x03, 0x72, 0x65, 0x67, 0x08, 0x04, 0x74, 0x65,
   0x73, 0x74, 0x69, 0x01, 0x00, 0x6a, 0x01, 0x00
 };