diff --git a/Makefile b/Makefile
index c28f1bc..bb0a956 100755
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@
 ROBOT_SANITY_MULT_PON_FILE      ?= $(ROOT_DIR)/tests/data/bbsim-kind-2x2.yaml
 ROBOT_SCALE_SINGLE_PON_FILE     ?= $(ROOT_DIR)/tests/data/bbsim-kind-16.yaml
 ROBOT_SCALE_MULT_PON_FILE       ?= $(ROOT_DIR)/tests/data/bbsim-kind-8x2.yaml
+ROBOT_SCALE_MULT_ONU_FILE       ?= $(ROOT_DIR)/tests/data/bbsim-kind-8x8.yaml
 ROBOT_DEBUG_LOG_OPT             ?=
 ROBOT_MISC_ARGS                 ?=
 
@@ -75,12 +76,20 @@
 
 # target to invoke openonu go adapter
 openonu-go-adapter-test: ROBOT_MISC_ARGS += -v state2test:4 -v testmode:SingleStateTime -v timeout:180s
-openonu-go-adapter-test: ROBOT_MISC_ARGS += -i statetest $(ROBOT_DEBUG_LOG_OPT)
+openonu-go-adapter-test: ROBOT_MISC_ARGS += -i onutest $(ROBOT_DEBUG_LOG_OPT)
 openonu-go-adapter-test: ROBOT_MISC_ARGS += -X
 openonu-go-adapter-test: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
 openonu-go-adapter-test: ROBOT_FILE := Voltha_ONUStateTests.robot
 openonu-go-adapter-test: openonu-go-adapter-statetest
 
+# target to invoke multiple openonu go adapter
+multi-openonu-go-adapter-test: ROBOT_MISC_ARGS += -v state2test:4 -v testmode:SingleStateTime -v timeout:180s
+multi-openonu-go-adapter-test: ROBOT_MISC_ARGS += -i onutest $(ROBOT_DEBUG_LOG_OPT)
+multi-openonu-go-adapter-test: ROBOT_MISC_ARGS += -X
+multi-openonu-go-adapter-test: ROBOT_CONFIG_FILE := $(ROBOT_SCALE_MULT_ONU_FILE)
+multi-openonu-go-adapter-test: ROBOT_FILE := Voltha_ONUStateTests.robot
+multi-openonu-go-adapter-test: openonu-go-adapter-statetest
+
 sanity-single-kind: ROBOT_MISC_ARGS += -i sanity $(ROBOT_DEBUG_LOG_OPT)
 sanity-single-kind: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
 sanity-single-kind: bbsim-kind
diff --git a/tests/data/bbsim-kind-8x8.yaml b/tests/data/bbsim-kind-8x8.yaml
new file mode 100755
index 0000000..35a0c50
--- /dev/null
+++ b/tests/data/bbsim-kind-8x8.yaml
@@ -0,0 +1,361 @@
+---
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+# Automated deployment configuration for kind-voltha running BBSim
+
+# Change default values in tests
+has_dataplane: false
+teardown_device: true
+ONOS_REST_PORT: 8181
+ONOS_SSH_PORT: 8101
+OLT_PORT: 50060
+
+nodes:
+  -
+    ip: '127.0.0.1'
+
+olts:
+  -
+    ip: bbsim0
+    serial: BBSIM_OLT_0
+
+hosts:
+  src:
+    - onu: 'BBSM00000001'
+      c_tag: '900'
+      s_tag: '900'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000002'
+      c_tag: '901'
+      s_tag: '900'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000003'
+      c_tag: '902'
+      s_tag: '900'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000004'
+      c_tag: '903'
+      s_tag: '900'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000005'
+      c_tag: '904'
+      s_tag: '900'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000006'
+      c_tag: '905'
+      s_tag: '900'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000007'
+      c_tag: '906'
+      s_tag: '900'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000008'
+      c_tag: '907'
+      s_tag: '900'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000101'
+      c_tag: '902'
+      s_tag: '910'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000102'
+      c_tag: '903'
+      s_tag: '910'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000103'
+      c_tag: '904'
+      s_tag: '910'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000104'
+      c_tag: '905'
+      s_tag: '910'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000105'
+      c_tag: '906'
+      s_tag: '910'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000106'
+      c_tag: '907'
+      s_tag: '910'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000107'
+      c_tag: '908'
+      s_tag: '910'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000108'
+      c_tag: '909'
+      s_tag: '910'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000201'
+      c_tag: '905'
+      s_tag: '920'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000202'
+      c_tag: '905'
+      s_tag: '920'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000203'
+      c_tag: '906'
+      s_tag: '920'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000204'
+      c_tag: '907'
+      s_tag: '920'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000205'
+      c_tag: '908'
+      s_tag: '920'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000206'
+      c_tag: '909'
+      s_tag: '920'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000207'
+      c_tag: '910'
+      s_tag: '920'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000208'
+      c_tag: '911'
+      s_tag: '920'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000301'
+      c_tag: '906'
+      s_tag: '930'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000302'
+      c_tag: '907'
+      s_tag: '930'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000303'
+      c_tag: '908'
+      s_tag: '930'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000304'
+      c_tag: '909'
+      s_tag: '930'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000305'
+      c_tag: '910'
+      s_tag: '930'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000306'
+      c_tag: '911'
+      s_tag: '930'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000307'
+      c_tag: '912'
+      s_tag: '930'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000308'
+      c_tag: '913'
+      s_tag: '930'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000401'
+      c_tag: '908'
+      s_tag: '940'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000402'
+      c_tag: '909'
+      s_tag: '940'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000403'
+      c_tag: '910'
+      s_tag: '940'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000404'
+      c_tag: '911'
+      s_tag: '940'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000405'
+      c_tag: '912'
+      s_tag: '940'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000406'
+      c_tag: '913'
+      s_tag: '940'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000407'
+      c_tag: '914'
+      s_tag: '940'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000408'
+      c_tag: '915'
+      s_tag: '940'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000501'
+      c_tag: '910'
+      s_tag: '950'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000502'
+      c_tag: '911'
+      s_tag: '950'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000503'
+      c_tag: '912'
+      s_tag: '950'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000504'
+      c_tag: '913'
+      s_tag: '950'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000505'
+      c_tag: '914'
+      s_tag: '950'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000506'
+      c_tag: '915'
+      s_tag: '950'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000507'
+      c_tag: '916'
+      s_tag: '950'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000508'
+      c_tag: '917'
+      s_tag: '950'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000601'
+      c_tag: '912'
+      s_tag: '960'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000602'
+      c_tag: '913'
+      s_tag: '960'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000603'
+      c_tag: '914'
+      s_tag: '960'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000604'
+      c_tag: '915'
+      s_tag: '960'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000605'
+      c_tag: '916'
+      s_tag: '960'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000606'
+      c_tag: '917'
+      s_tag: '960'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000607'
+      c_tag: '918'
+      s_tag: '960'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000608'
+      c_tag: '919'
+      s_tag: '960'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000701'
+      c_tag: '914'
+      s_tag: '970'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000702'
+      c_tag: '915'
+      s_tag: '970'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000703'
+      c_tag: '916'
+      s_tag: '970'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000704'
+      c_tag: '917'
+      s_tag: '970'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000705'
+      c_tag: '918'
+      s_tag: '970'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000706'
+      c_tag: '919'
+      s_tag: '970'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000707'
+      c_tag: '920'
+      s_tag: '970'
+      olt: BBSIM_OLT_0
+    - onu: 'BBSM00000708'
+      c_tag: '921'
+      s_tag: '970'
+      olt: BBSIM_OLT_0
+
+  dst:
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+
+sadis:
+  file: ${CURDIR}/../../data/onos-sadis-bbsim.json