diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index 47b30cb..a1a3488 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -45,3 +45,6 @@
     - ip: null
     - ip: null
     - ip: null
+
+sadis:
+  file: ${CURDIR}/../../data/sadis-with-tp-2x2.json
\ No newline at end of file
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index 12ab725..a913a2e 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -39,3 +39,6 @@
 
   dst:
     - ip: null
+
+sadis:
+  file: ${CURDIR}/../../data/sadis-with-tp-2x2.json
diff --git a/tests/data/sadis-notp-1.json b/tests/data/sadis-notp-1.json
deleted file mode 100644
index a82ef86..0000000
--- a/tests/data/sadis-notp-1.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "apps": {
-    "org.opencord.sadis": {
-      "sadis": {
-        "integration": {
-          "cache": {
-            "enabled": false,
-            "maxsize": 50,
-            "ttl": "PT0m"
-          }
-        },
-        "entries": [
-          {
-            "id": "BBSIMOLT000",
-            "hardwareIdentifier": "00:00:0a:62:ce:e2",
-            "ipAddress": ":OLT_IPADDR:",
-            "nasId": "BBSIMOLT000",
-            "uplinkPort": 65536
-          },
-          {
-            "id": "BBSM00000001-1",
-            "cTag": 900,
-            "sTag": 900,
-            "nasPortId": "PON 2/1/01/1:1.1.1"
-          }
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/data/sadis-with-tp-2x2.json b/tests/data/sadis-with-tp-2x2.json
new file mode 100644
index 0000000..0c19595
--- /dev/null
+++ b/tests/data/sadis-with-tp-2x2.json
@@ -0,0 +1,82 @@
+{
+  "sadis": {
+    "integration": {
+      "cache": {
+        "enabled": false,
+        "maxsize": 50,
+        "ttl": "PT0m"
+      }
+    },
+    "entries": [
+      {
+        "id": "BBSIM_OLT_0",
+        "hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
+        "nasId": "BBSIMOLT000",
+        "uplinkPort": 65536
+      },
+      {
+        "id": "BBSM00000001-1",
+        "cTag": 900,
+        "sTag": 900,
+        "nasPortId": "BBSM00000001-1",
+        "circuitId": "BBSM00000001-1",
+        "remoteId": "BBSIMOLT000",
+        "technologyProfileId": 64,
+        "upstreamBandwidthProfile": "Default",
+        "downstreamBandwidthProfile": "Default"
+      },
+      {
+        "id": "BBSM00000002-1",
+        "cTag": 901,
+        "sTag": 900,
+        "nasPortId": "BBSM00000002-1",
+        "circuitId": "BBSM00000002-1",
+        "remoteId": "BBSIMOLT000",
+        "technologyProfileId": 64,
+        "upstreamBandwidthProfile": "Default",
+        "downstreamBandwidthProfile": "Default"
+      },
+      {
+        "id": "BBSM00000101-1",
+        "cTag": 902,
+        "sTag": 900,
+        "nasPortId": "BBSM00000101-1",
+        "circuitId": "BBSM00000101-1",
+        "remoteId": "BBSIMOLT000",
+        "technologyProfileId": 64,
+        "upstreamBandwidthProfile": "Default",
+        "downstreamBandwidthProfile": "Default"
+      },
+      {
+        "id": "BBSM00000102-1",
+        "cTag": 903,
+        "sTag": 900,
+        "nasPortId": "BBSM00000102-1",
+        "circuitId": "BBSM00000102-1",
+        "remoteId": "BBSIMOLT000",
+        "technologyProfileId": 64,
+        "upstreamBandwidthProfile": "Default",
+        "downstreamBandwidthProfile": "Default"
+      }
+    ]
+  },
+  "bandwidthprofile": {
+    "integration": {
+      "cache": {
+        "enabled": true,
+        "maxsize": 40,
+        "ttl": "PT1m"
+      }
+    },
+    "entries": [
+      {
+        "id": "Default",
+        "cir": 1000000,
+        "cbs": 1001,
+        "eir": 1002,
+        "ebs": 1003,
+        "air": 1004
+      }
+    ]
+  }
+}
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 44a6bd7..24abaeb 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -148,47 +148,8 @@
 
 *** Keywords ***
 Setup Suite
-    [Documentation]    Setup the whole test suite
-    # BBSim sanity test doesn't need these imports from other repositories
-    Run Keyword If    ${external_libs}    Import Library
-    ...    ${CURDIR}/../../../voltha/tests/atests/common/testCaseUtils.py
-    Run Keyword If    ${external_libs}    Import Resource
-    ...    ${CURDIR}/../../../cord-tester/src/test/cord-api/Framework/Subscriber.robot
-    Run Keyword If    ${external_libs}    Import Resource
-    ...    ${CURDIR}/../../../cord-tester/src/test/cord-api/Framework/OLT.robot
-    Run Keyword If    ${external_libs}    Import Resource
-    ...    ${CURDIR}/../../../cord-tester/src/test/cord-api/Framework/DHCP.robot
-    Run Keyword If    ${external_libs}    Import Resource
-    ...    ${CURDIR}/../../../cord-tester/src/test/cord-api/Framework/Kubernetes.robot
-    Set Global Variable    ${KUBECTL_CONFIG}    export KUBECONFIG=%{KUBECONFIG}
-    Set Global Variable    ${export_kubeconfig}    export KUBECONFIG=${KUBERNETES_CONF}
-    Set Global Variable    ${VOLTCTL_CONFIG}    export VOLTCONFIG=%{VOLTCONFIG}
-    ${k8s_node_ip}=    Evaluate    ${nodes}[0].get("ip")
-    ${k8s_node_user}=    Evaluate    ${nodes}[0].get("user")
-    ${k8s_node_pass}=    Evaluate    ${nodes}[0].get("pass")
-    Check CLI Tools Configured
-    ${onos_auth}=    Create List    karaf    karaf
-    ${HEADERS}    Create Dictionary    Content-Type=application/json
-    Create Session    ONOS    http://${k8s_node_ip}:${ONOS_REST_PORT}    auth=${ONOS_AUTH}
-    ${olt_ip}=    Evaluate    ${olts}[0].get("ip")
-    ${olt_user}=    Evaluate    ${olts}[0].get("user")
-    ${olt_pass}=    Evaluate    ${olts}[0].get("pass")
-    ${olt_serial_number}=    Evaluate    ${olts}[0].get("serial")
-    ${num_onus}=    Get Length    ${hosts.src}
-    ${num_onus}=    Convert to String    ${num_onus}
-    Set Suite Variable    ${num_onus}
-    Set Suite Variable    ${olt_serial_number}
-    Set Suite Variable    ${olt_ip}
-    Set Suite Variable    ${olt_user}
-    Set Suite Variable    ${olt_pass}
-    Set Suite Variable    ${k8s_node_ip}
-    Set Suite Variable    ${k8s_node_user}
-    Set Suite Variable    ${k8s_node_pass}
-    @{container_list}=    Create List    adapter-open-olt    adapter-open-onu    voltha-api-server
-    ...    voltha-ro-core    voltha-rw-core-11    voltha-rw-core-12    voltha-ofagent
-    Set Suite Variable    ${container_list}
-    ${datetime}=    Get Current Date
-    Set Suite Variable    ${datetime}
+    [Documentation]    Set up the test suite
+    Common Test Suite Setup
 
 Setup
     [Documentation]    Pre-test Setup
diff --git a/tests/functional/Voltha_ScaleFunctionalTests.robot b/tests/functional/Voltha_ScaleFunctionalTests.robot
index 05108ba..b4f46e2 100644
--- a/tests/functional/Voltha_ScaleFunctionalTests.robot
+++ b/tests/functional/Voltha_ScaleFunctionalTests.robot
@@ -111,50 +111,8 @@
 
 *** Keywords ***
 Setup Suite
-    [Documentation]    Setup the whole test suite
-    # BBSim sanity test doesn't need these imports from other repositories
-    Run Keyword If    ${external_libs}    Import Library
-    ...    ${CURDIR}/../../../voltha/tests/atests/common/testCaseUtils.py
-    Run Keyword If    ${external_libs}    Import Resource
-    ...    ${CURDIR}/../../../cord-tester/src/test/cord-api/Framework/Subscriber.robot
-    Run Keyword If    ${external_libs}    Import Resource
-    ...    ${CURDIR}/../../../cord-tester/src/test/cord-api/Framework/OLT.robot
-    Run Keyword If    ${external_libs}    Import Resource
-    ...    ${CURDIR}/../../../cord-tester/src/test/cord-api/Framework/DHCP.robot
-    Run Keyword If    ${external_libs}    Import Resource
-    ...    ${CURDIR}/../../../cord-tester/src/test/cord-api/Framework/Kubernetes.robot
-    Set Global Variable    ${KUBECTL_CONFIG}    export KUBECONFIG=%{KUBECONFIG}
-    Set Global Variable    ${VOLTCTL_CONFIG}    export VOLTCONFIG=%{VOLTCONFIG}
-    ${k8s_node_ip}=    Evaluate    ${nodes}[0].get("ip")
-    ${k8s_node_user}=    Evaluate    ${nodes}[0].get("user")
-    ${k8s_node_pass}=    Evaluate    ${nodes}[0].get("pass")
-    Check CLI Tools Configured
-    ${onos_auth}=    Create List    karaf    karaf
-    ${HEADERS}    Create Dictionary    Content-Type=application/json
-    Create Session    ONOS    http://${k8s_node_ip}:${ONOS_REST_PORT}    auth=${ONOS_AUTH}
-    ${olt_ip}=    Evaluate    ${olts}[0].get("ip")
-    ${olt_user}=    Evaluate    ${olts}[0].get("user")
-    ${olt_pass}=    Evaluate    ${olts}[0].get("pass")
-    ${olt_serial_number}=    Evaluate    ${olts}[0].get("serial")
-    ${num_onus}=    Get Length    ${hosts.src}
-    ${num_onus}=    Convert to String    ${num_onus}
-    #send sadis file to onos
-    ${sadis_file}=    Evaluate    ${sadis}.get("file")
-    Log To Console  \nSadis File:${sadis_file}
-    Run Keyword Unless    '${sadis_file}' is '${None}'    Send File To Onos    ${sadis_file}    apps/
-    Set Suite Variable    ${num_onus}
-    Set Suite Variable    ${olt_serial_number}
-    Set Suite Variable    ${olt_ip}
-    Set Suite Variable    ${olt_user}
-    Set Suite Variable    ${olt_pass}
-    Set Suite Variable    ${k8s_node_ip}
-    Set Suite Variable    ${k8s_node_user}
-    Set Suite Variable    ${k8s_node_pass}
-    @{container_list}=    Create List    adapter-open-olt    adapter-open-onu    voltha-api-server
-    ...    voltha-ro-core    voltha-rw-core-11    voltha-rw-core-12    voltha-ofagent
-    Set Suite Variable    ${container_list}
-    ${datetime}=    Get Current Date
-    Set Suite Variable    ${datetime}
+    [Documentation]    Set up the test suite
+    Common Test Suite Setup
 
 Teardown Suite
     [Documentation]    Clean up devices if desired