diff --git a/tests/itests/docutests/build_md_test.py b/tests/itests/docutests/build_md_test.py
index a16efe7..d8c888c 100644
--- a/tests/itests/docutests/build_md_test.py
+++ b/tests/itests/docutests/build_md_test.py
@@ -205,8 +205,7 @@
                 'grpc_server.start {event: started',
                 'main.<lambda> {event: twisted-reactor-started',
                 'main.startup_components {event: started-internal-services,',
-                'kafka_proxy.send_message {event: Sending message Heartbeat '
-                'message',
+                'kafka_proxy.start {event: started,',
                 'coordinator._backoff {retry_in: 5, event: consul-not-up,'
             ]
 
@@ -398,7 +397,8 @@
             expected_services = ['consul-rest', 'fluentd-intake',
                                  'chameleon-rest', 'voltha-grpc',
                                  'voltha-health',
-                                 'consul-8600', 'zookeeper', 'consul', 'kafka']
+                                 'consul-8600', 'zookeeper', 'consul',
+                                 'kafka']
 
             cmd = command_defs['consul_get_services']
             out, err, rc = run_command_to_completion_with_raw_stdout(cmd)
@@ -441,7 +441,7 @@
 
             # Verify kafka client is receiving the messages
             print "Verify kafka client is receiving the heartbeat messages ..."
-            expected_pattern = ['voltha-heartbeat', 'Heartbeat message']
+            expected_pattern = ['heartbeat.voltha', 'heartbeat']
             cmd = command_defs['kafka_client_run_10_secs']
             kafka_client_output = run_long_running_command_with_timeout(cmd,
                                                                         20)
@@ -461,7 +461,7 @@
                   "..."
             expected_output = ['voltha_1', 'fluentd_1', 'consul_1',
                                'registrator_1', 'kafka_1', 'zookeeper_1',
-                               'chameleon_1']
+                               'chameleon_1', 'ofagent_1', 'netconf_1']
             cmd = command_defs['docker_compose_logs']
             docker_compose_logs = run_long_running_command_with_timeout(cmd, 5,
                                                                         0)
@@ -722,8 +722,8 @@
         expected_output = [
             "(.*)registrator_1(.*)Listening for Docker events",
             "(.*)voltha_1(.*)main.heartbeat {status: up, uptime:",
-            "(.*)voltha_1(.*)kafka_proxy.send_message {event: Successfully "
-            "sent message Heartbeat message",
+            "(.*)voltha_1(.*)kafka_proxy.send_message(.*)event: "
+            "sent-kafka-msg",
             "(.*)fluentd_1(.*)listening fluent socket on",
             "(.*)chameleon_1(.*)main.startup_components {event: "
             "started-internal-services, instance_id: compose_chameleon_1}",
diff --git a/tests/itests/docutests/test_utils.py b/tests/itests/docutests/test_utils.py
index a0b2422..f987b0f 100644
--- a/tests/itests/docutests/test_utils.py
+++ b/tests/itests/docutests/test_utils.py
@@ -81,8 +81,9 @@
             if return_word_number_x_of_each_line != -1:
                 ansi_escape = re.compile(r'\x1b[^m]*m')
                 line = ansi_escape.sub('', line)
-                captured_stdout.append(
-                    line.split()[return_word_number_x_of_each_line])
+                if len(line.split()) > return_word_number_x_of_each_line:
+                    captured_stdout.append(
+                        line.split()[return_word_number_x_of_each_line])
             else:
                 captured_stdout.append(line)
             if time.time() - t0 > timeout: