diff --git a/demo_test/functional_test/tests/clear_all_subscribed_events.expected b/demo_test/functional_test/tests/clear_all_subscribed_events.expected
index 25e732c..f05a3fd 100644
--- a/demo_test/functional_test/tests/clear_all_subscribed_events.expected
+++ b/demo_test/functional_test/tests/clear_all_subscribed_events.expected
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-192.168.4.27:8888 attached
+ip1:port1 attached
 Alert ResourceAdded ResourceRemoved
-192.168.4.27:8888 events cleared
+ip1:port1 events cleared
 
-192.168.4.27:8888 deleted
+ip1:port1 deleted
diff --git a/demo_test/functional_test/tests/clear_all_subscribed_events.tc b/demo_test/functional_test/tests/clear_all_subscribed_events.tc
index f5eef7a..b88f318 100755
--- a/demo_test/functional_test/tests/clear_all_subscribed_events.tc
+++ b/demo_test/functional_test/tests/clear_all_subscribed_events.tc
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./dm attach 192.168.4.27:8888:120
-./dm showdeviceeventlist 192.168.4.27:8888
-./dm cleardeviceeventlist 192.168.4.27:8888
-./dm showdeviceeventlist 192.168.4.27:8888
-./dm delete 192.168.4.27:8888
+./dm attach $1:$2:120
+./dm showdeviceeventlist $1:$2
+./dm cleardeviceeventlist $1:$2
+./dm showdeviceeventlist $1:$2
+./dm delete $1:$2
diff --git a/demo_test/functional_test/tests/configure_data_polling_interval.expected b/demo_test/functional_test/tests/configure_data_polling_interval.expected
index b3e56c1..66e93bb 100644
--- a/demo_test/functional_test/tests/configure_data_polling_interval.expected
+++ b/demo_test/functional_test/tests/configure_data_polling_interval.expected
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-192.168.4.27:8888 attached
+ip1:port1 attached
 data collection interval configured to 30 seconds
 Invalid interval
 data collection interval configured to 0 seconds
-192.168.4.27:8888 deleted
+ip1:port1 deleted
diff --git a/demo_test/functional_test/tests/configure_data_polling_interval.tc b/demo_test/functional_test/tests/configure_data_polling_interval.tc
index 0939a79..01202ce 100755
--- a/demo_test/functional_test/tests/configure_data_polling_interval.tc
+++ b/demo_test/functional_test/tests/configure_data_polling_interval.tc
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./dm attach 192.168.4.27:8888:120
-./dm period 192.168.4.27:8888:30
-./dm period 192.168.4.27:8888:3
-./dm period 192.168.4.27:8888:0
-./dm delete 192.168.4.27:8888
+./dm attach $1:$2:120
+./dm period $1:$2:30
+./dm period $1:$2:3
+./dm period $1:$2:0
+./dm delete $1:$2
diff --git a/demo_test/functional_test/tests/delete_monitored_device.expected b/demo_test/functional_test/tests/delete_monitored_device.expected
index 8e1cc31..65763d9 100644
--- a/demo_test/functional_test/tests/delete_monitored_device.expected
+++ b/demo_test/functional_test/tests/delete_monitored_device.expected
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-192.168.4.26:8888 192.168.4.27:8888 attached
-192.168.4.26:8888 192.168.4.27:8888 deleted
-Device 192.168.4.27:8888 not found
+ip1:port1 ip2:port2 attached
+ip1:port1 ip2:port2 deleted
+Device ip1:port1 not found
diff --git a/demo_test/functional_test/tests/delete_monitored_device.tc b/demo_test/functional_test/tests/delete_monitored_device.tc
index 7860e0b..7c99273 100755
--- a/demo_test/functional_test/tests/delete_monitored_device.tc
+++ b/demo_test/functional_test/tests/delete_monitored_device.tc
@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./dm attach 192.168.4.27:8888:120 192.168.4.26:8888:100
-./dm delete 192.168.4.27:8888 192.168.4.26:8888
-./dm delete 192.168.4.27:8888
+./dm attach $1:$2:120 $3:$4:100
+./dm delete $1:$2 $3:$4
+./dm delete $1:$2
diff --git a/demo_test/functional_test/tests/list_device_monitored.expected b/demo_test/functional_test/tests/list_device_monitored.expected
index 2f98be3..4acf927 100644
--- a/demo_test/functional_test/tests/list_device_monitored.expected
+++ b/demo_test/functional_test/tests/list_device_monitored.expected
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 No Device found
-192.168.4.26:8888 192.168.4.27:8888 attached
-192.168.4.26:8888 192.168.4.27:8888
-192.168.4.26:8888 192.168.4.27:8888 deleted
+ip1:port1 ip2:port2 attached
+ip1:port1 ip2:port2
+ip1:port1 ip2:port2 deleted
diff --git a/demo_test/functional_test/tests/list_device_monitored.tc b/demo_test/functional_test/tests/list_device_monitored.tc
index 0016968..5e4bc01 100755
--- a/demo_test/functional_test/tests/list_device_monitored.tc
+++ b/demo_test/functional_test/tests/list_device_monitored.tc
@@ -15,6 +15,6 @@
 # limitations under the License.
 
 ./dm showdevices
-./dm attach 192.168.4.26:8888:120 192.168.4.27:8888:100
+./dm attach $1:$2:120 $3:$4:100
 ./dm showdevices
-./dm delete 192.168.4.26:8888 192.168.4.27:8888
+./dm delete $1:$2 $3:$4
diff --git a/demo_test/functional_test/tests/list_subscribed_events.expected b/demo_test/functional_test/tests/list_subscribed_events.expected
index ad6f141..0b07d01 100644
--- a/demo_test/functional_test/tests/list_subscribed_events.expected
+++ b/demo_test/functional_test/tests/list_subscribed_events.expected
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-Device 192.168.4.26:8888 not registered
-192.168.4.26:8888 attached
+Device ip1:port1 not registered
+ip1:port1 attached
 Alert ResourceAdded ResourceRemoved
-192.168.4.26:8888 deleted
+ip1:port1 deleted
diff --git a/demo_test/functional_test/tests/list_subscribed_events.tc b/demo_test/functional_test/tests/list_subscribed_events.tc
index 819aaeb..47f47e4 100755
--- a/demo_test/functional_test/tests/list_subscribed_events.tc
+++ b/demo_test/functional_test/tests/list_subscribed_events.tc
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./dm showdeviceeventlist 192.168.4.26:8888
-./dm attach 192.168.4.26:8888:120
-./dm showdeviceeventlist 192.168.4.26:8888
-./dm delete 192.168.4.26:8888
+./dm showdeviceeventlist $1:$2
+./dm attach $1:$2:120
+./dm showdeviceeventlist $1:$2
+./dm delete $1:$2
diff --git a/demo_test/functional_test/tests/list_supported_events.expected b/demo_test/functional_test/tests/list_supported_events.expected
index 27a563f..0b07d01 100644
--- a/demo_test/functional_test/tests/list_supported_events.expected
+++ b/demo_test/functional_test/tests/list_supported_events.expected
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-Device 192.168.4.27:8888 not registered
-192.168.4.26:8888 attached
+Device ip1:port1 not registered
+ip1:port1 attached
 Alert ResourceAdded ResourceRemoved
-192.168.4.26:8888 deleted
+ip1:port1 deleted
diff --git a/demo_test/functional_test/tests/list_supported_events.tc b/demo_test/functional_test/tests/list_supported_events.tc
index dff2eed..8f23e06 100755
--- a/demo_test/functional_test/tests/list_supported_events.tc
+++ b/demo_test/functional_test/tests/list_supported_events.tc
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./dm showeventlist 192.168.4.27:8888
-./dm attach 192.168.4.26:8888:120
-./dm showeventlist 192.168.4.26:8888
-./dm delete 192.168.4.26:8888
+./dm showeventlist $1:$2
+./dm attach $1:$2:120
+./dm showeventlist $1:$2
+./dm delete $1:$2
diff --git a/demo_test/functional_test/tests/subscribe_events.expected b/demo_test/functional_test/tests/subscribe_events.expected
index 73e9325..1778144 100644
--- a/demo_test/functional_test/tests/subscribe_events.expected
+++ b/demo_test/functional_test/tests/subscribe_events.expected
@@ -11,9 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-Device 192.168.4.27:8888 not registered
-192.168.4.27:8888 attached
+Device ip1:port1 not registered
+ip1:port1 attached
 Alert ResourceAdded ResourceRemoved
 event ResourceAdded already subscribed
 event Update not supported
-192.168.4.27:8888 deleted
+ip1:port1 deleted
diff --git a/demo_test/functional_test/tests/subscribe_events.tc b/demo_test/functional_test/tests/subscribe_events.tc
index 41abd92..ef108e9 100755
--- a/demo_test/functional_test/tests/subscribe_events.tc
+++ b/demo_test/functional_test/tests/subscribe_events.tc
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./dm sub 192.168.4.27:8888:add
-./dm attach 192.168.4.27:8888:120
-./dm showdeviceeventlist 192.168.4.27:8888
-./dm sub 192.168.4.27:8888:add
-./dm sub 192.168.4.27:8888:update
-./dm delete 192.168.4.27:8888
+./dm sub $1:$2:add
+./dm attach $1:$2:120
+./dm showdeviceeventlist $1:$2
+./dm sub $1:$2:add
+./dm sub $1:$2:update
+./dm delete $1:$2
diff --git a/demo_test/functional_test/tests/unsubscribe_events.expected b/demo_test/functional_test/tests/unsubscribe_events.expected
index eee0d10..fd1b1cb 100644
--- a/demo_test/functional_test/tests/unsubscribe_events.expected
+++ b/demo_test/functional_test/tests/unsubscribe_events.expected
@@ -11,11 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-Device 192.168.4.27:8888 not registered
-192.168.4.27:8888 attached
+Device ip1:port1 not registered
+ip1:port1 attached
 Alert ResourceAdded ResourceRemoved
 unsub successful
 Alert ResourceRemoved
 event ResourceAdded not found
 event Update not found
-192.168.4.27:8888 deleted
+ip1:port1 deleted
diff --git a/demo_test/functional_test/tests/unsubscribe_events.tc b/demo_test/functional_test/tests/unsubscribe_events.tc
index df9d440..96d069a 100755
--- a/demo_test/functional_test/tests/unsubscribe_events.tc
+++ b/demo_test/functional_test/tests/unsubscribe_events.tc
@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./dm unsub 192.168.4.27:8888:add
-./dm attach 192.168.4.27:8888:120
-./dm showdeviceeventlist 192.168.4.27:8888
-./dm unsub 192.168.4.27:8888:add
-./dm showdeviceeventlist 192.168.4.27:8888
-./dm unsub 192.168.4.27:8888:add
-./dm unsub 192.168.4.27:8888:update
-./dm delete 192.168.4.27:8888
+./dm unsub $1:$2:add
+./dm attach $1:$2:120
+./dm showdeviceeventlist $1:$2
+./dm unsub $1:$2:add
+./dm showdeviceeventlist $1:$2
+./dm unsub $1:$2:add
+./dm unsub $1:$2:update
+./dm delete $1:$2
diff --git a/demo_test/functional_test/tests/validate_ip.expected b/demo_test/functional_test/tests/validate_ip.expected
index ab281ef..d4f0fc3 100644
--- a/demo_test/functional_test/tests/validate_ip.expected
+++ b/demo_test/functional_test/tests/validate_ip.expected
@@ -14,4 +14,4 @@
 Incorrect IP address format (<ip>:<port #>)
 Invalid IP address 192.168.4
 Port # 8a needs to be an integer
-Device 192.168.4.27:8888 not registered
+Device ip1:port1 not registered
diff --git a/demo_test/functional_test/tests/validate_ip.tc b/demo_test/functional_test/tests/validate_ip.tc
index 64bdd39..de13243 100755
--- a/demo_test/functional_test/tests/validate_ip.tc
+++ b/demo_test/functional_test/tests/validate_ip.tc
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-./dm showeventlist 192.168.4.27
+./dm showeventlist $1
 ./dm showeventlist 192.168.4:8
-./dm showeventlist 192.168.4.27:8a
-./dm showeventlist 192.168.4.27:8888
+./dm showeventlist $1:8a
+./dm showeventlist $1:$2