diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-01-Distributed-Switch.md b/tests/test-cases/Group5-Interoperability-Tests/5-01-Distributed-Switch.md
deleted file mode 100644
index 21a6349e8..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-01-Distributed-Switch.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Test 5-01 - Distributed Switch
-=======
-
-# Purpose:
-To verify the VIC OVA appliance and Wizard UI works in a variety of different vCenter networking configurations
-
-# References:
-[1 - VMware Distributed Switch Feature](https://www.vmware.com/products/vsphere/features/distributed-switch.html)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter in Nimbus that is a simple VC with a distributed switch
-2. Install the VIC OVA appliance
-3. Walk through completing the install and use the VCH creation wizard to create a VCH
-4. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH and VIC appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-* When you add an ESXi host to the vCenter it will overwrite its datastore name from datastore1 to datastore1 (n)
-* govc requires an actual password so you need to change the default ESXi password before Step 4
-* govc doesn't seem to be able to force a host NIC over to the new distributed switch, thus you need to create the ESXi hosts with 2 NICs in order to use the 2nd NIC for the distributed switch
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-01-Distributed-Switch.robot b/tests/test-cases/Group5-Interoperability-Tests/5-01-Distributed-Switch.robot
deleted file mode 100644
index ef7634fab..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-01-Distributed-Switch.robot
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2018 VMware, Inc. All Rights Reserved.
-#
-# 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
-
-*** Settings ***
-Documentation  Test 5-01 - Distributed Switch
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Distributed Switch Setup
-#Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Variables ***
-${esx_number}=  3
-${datacenter}=  ha-datacenter
-
-*** Keywords ***
-Distributed Switch Setup
-    [Timeout]    110 minutes
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${vc}=  Evaluate  'VC-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    ${pid}=  Deploy Nimbus vCenter Server Async  ${vc}
-    Set Suite Variable  ${VC}  ${vc}
-
-    &{esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  3  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    @{esx_names}=  Get Dictionary Keys  ${esxes}
-    @{esx_ips}=  Get Dictionary Values  ${esxes}
-
-    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
-
-    # Finish vCenter deploy
-    ${output}=  Wait For Process  ${pid}
-    Should Contain  ${output.stdout}  Overall Status: Succeeded
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vc_ip}=  Get IP  ${vc}
-    Close Connection
-
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Set Environment Variable  GOVC_URL  ${vc_ip}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ${datacenter}
-    Should Be Empty  ${out}
-
-    Create A Distributed Switch  ${datacenter}
-
-    Create Three Distributed Port Groups  ${datacenter}
-
-    Log To Console  Add ESX host to the VC and Distributed Switch
-    :FOR  ${IDX}  IN RANGE  ${esx_number}
-    \   ${out}=  Run  govc host.add -hostname=@{esx_ips}[${IDX}] -username=root -dc=${datacenter} -password=${NIMBUS_ESX_PASSWORD} -noverify=true
-    \   Should Contain  ${out}  OK
-    \   Wait Until Keyword Succeeds  5x  15 seconds  Add Host To Distributed Switch  @{esx_ips}[${IDX}]
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL  ${vc_ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_RESOURCE  /${datacenter}/host/@{esx_ips}[0]/Resources
-    Set Environment Variable  TEST_TIMEOUT  30m
-    Set Environment Variable  TEST_DATASTORE  datastore1
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Set Environment Variable  OVA_NAME  OVA-5-01-TEST
-    Set Global Variable  ${OVA_USERNAME_ROOT}  root
-    Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
-
-    # pending steps:
-    #
-    # install OVA and initialize
-    # verify OVA components
-    # install VIC
-    # verify wizard ui scenario
-    
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-02-Cluster.md b/tests/test-cases/Group5-Interoperability-Tests/5-02-Cluster.md
deleted file mode 100644
index 0aa39d296..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-02-Cluster.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 5-2 - Cluster
-=======
-
-# Purpose:
-To verify the VIC OVA appliance and Wizard UI works when the vCenter appliance is using a cluster
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with 3 ESXi hosts in a cluster:  
-```govc cluster.create cls```
-2. Install the VIC OVA appliance
-3. Walk through completing the install and use the VCH creation wizard to create a VCH using the cluster path as the compute resource
-4. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH and VIC appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-02-Cluster.robot b/tests/test-cases/Group5-Interoperability-Tests/5-02-Cluster.robot
deleted file mode 100644
index 83b623855..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-02-Cluster.robot
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2018 VMware, Inc. All Rights Reserved.
-#
-# 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
-
-*** Settings ***
-Documentation  Test 5-02 - Cluster
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Cluster Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-Cluster Setup
-    [Timeout]    110 minutes
-    Log To Console  \nWait until Nimbus is at least available...
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  10 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Close Connection
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${vc}=  Evaluate  'VC-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    ${pid}=  Deploy Nimbus vCenter Server Async  ${vc}
-
-    &{esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  3  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  ${ESX_VERSION}
-    @{esx_names}=  Get Dictionary Keys  ${esxes}
-    @{esx_ips}=  Get Dictionary Values  ${esxes}
-
-    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
-
-    # Finish vCenter deploy
-    ${output}=  Wait For Process  ${pid}
-    Should Contain  ${output.stdout}  Overall Status: Succeeded
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vc-ip}=  Get IP  ${vc}
-    Close Connection
-
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ha-datacenter
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    ${out}=  Run  govc cluster.add -hostname=@{esx_ips}[0] -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc cluster.add -hostname=@{esx_ips}[1] -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc cluster.add -hostname=@{esx_ips}[2] -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Create A Distributed Switch  ha-datacenter
-
-    Create Three Distributed Port Groups  ha-datacenter
-
-    Wait Until Keyword Succeeds  5x  1 minute  Add Host To Distributed Switch  /ha-datacenter/host/cls/@{esx_ips}[0]
-    Wait Until Keyword Succeeds  5x  1 minute  Add Host To Distributed Switch  /ha-datacenter/host/cls/@{esx_ips}[1]
-    Wait Until Keyword Succeeds  5x  1 minute  Add Host To Distributed Switch  /ha-datacenter/host/cls/@{esx_ips}[2]
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    Set Environment Variable  TEST_URL  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Set Environment Variable  OVA_NAME  OVA-5-02-TEST
-    Set Global Variable  ${OVA_USERNAME_ROOT}  root
-    Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
-
-    # pending steps:
-    #
-    # install OVA and initialize
-    # verify OVA components
-    # create VCH using wizard UI
-    # run docker commands
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-03-Enhanced-Linked-Mode.md b/tests/test-cases/Group5-Interoperability-Tests/5-03-Enhanced-Linked-Mode.md
deleted file mode 100644
index ae121b94f..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-03-Enhanced-Linked-Mode.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 5-3 - Enhanced Linked Mode
-=======
-
-# Purpose:
-To verify the VIC appliance and Wizard UI works in when the vCenter appliance is using enhanced linked mode
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy two new vCenters in Nimbus each with one ESXi host configured
-2. Establish an enhanced link between the two vCenters
-3. Install the VIC OVA appliance
-4. Walk through completing the install and use the VCH creation wizard to create a VCH
-5. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH and VIC appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-03-Enhanced-Linked-Mode.robot b/tests/test-cases/Group5-Interoperability-Tests/5-03-Enhanced-Linked-Mode.robot
deleted file mode 100644
index 94b650846..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-03-Enhanced-Linked-Mode.robot
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2018 VMware, Inc. All Rights Reserved.
-#
-# 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
-
-*** Settings ***
-Documentation  Test 5-03 - Enhanced Linked Mode
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Enhanced Link Mode Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-# Insert elements from dict2 into dict1, overwriting conflicts in dict1 & returning new dict
-Combine Dictionaries
-    [Arguments]  ${dict1}  ${dict2}
-    ${dict2keys}=  Get Dictionary Keys  ${dict2}
-    :FOR  ${key}  IN  @{dict2keys}
-    \    ${elem}=  Get From Dictionary  ${dict2}  ${key}
-    \    Set To Dictionary  ${dict1}  ${key}  ${elem}
-    [Return]  ${dict1}
-
-Enhanced Link Mode Setup
-    [Timeout]    110 minutes
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${name}=  Evaluate  'els-' + str(random.randint(1000,9999))  modules=random
-    Set Suite Variable  ${user}  %{NIMBUS_USER}
-    Log To Console  \nDeploying Nimbus Testbed: ${name}
-
-    ${pid}=  Run Secret SSHPASS command  %{NIMBUS_USER}  '%{NIMBUS_PASSWORD}'  'nimbus-testbeddeploy --lease 0.25 --noStatsDump --noSupportBundles --plugin test-vpx --testbedName test-vpx-m2n2-vcva-3esx-pxeBoot-8gbmem --vcvaBuild ${VC_VERSION} --esxPxeDir ${ESX_VERSION} --runName ${name}'
-
-    &{esxes}=  Create Dictionary
-    ${num_of_esxes}=  Evaluate  3
-    :FOR  ${i}  IN RANGE  3
-    # Deploy some ESXi instances
-    \    &{new_esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  ${num_of_esxes}  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    \    ${esxes}=  Combine Dictionaries  ${esxes}  ${new_esxes}
-
-    # Investigate to see how many were actually deployed
-    \    ${len}=  Get Length  ${esxes}
-    \    ${num_of_esxes}=  Evaluate  3 - ${len}
-
-    # Exit if we've got enough & continue loop if we don't
-    \    Exit For Loop If  ${len} >= 3
-    \    Log To Console  Only got ${len} ESXi instance(s); Trying again
-
-    @{esx-names}=  Get Dictionary Keys  ${esxes}
-    @{esx-ips}=  Get Dictionary Values  ${esxes}
-    ${esx1}=  Get From List  ${esx-names}  0
-    ${esx2}=  Get From List  ${esx-names}  1
-    ${esx3}=  Get From List  ${esx-names}  2
-    ${esx4-ip}=  Get From List  ${esx-ips}  0
-    ${esx5-ip}=  Get From List  ${esx-ips}  1
-    ${esx6-ip}=  Get From List  ${esx-ips}  2
-
-    # Finish test bed deploy
-    ${output}=  Wait For Process  ${pid}  timeout=70 minutes  on_timeout=terminate
-    Log  ${output.stdout}
-    Log  ${output.stderr}
-    Should Be Equal As Integers  ${output.rc}  0
-    ${output}=  Split To Lines  ${output.stdout}
-    :FOR  ${line}  IN  @{output}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  ${name}.vc.0' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${vc1-ip}  ${ip}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  ${name}.vc.1' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${vc2-ip}  ${ip}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  ${name}.esx.0' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${esx1-ip}  ${ip}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  ${name}.esx.1' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${esx2-ip}  ${ip}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  ${name}.esx.2' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${esx3-ip}  ${ip}
-
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${user}-${name}.vc.0  ${user}-${name}.vc.1  ${user}-${name}.vc.2  ${user}-${name}.vc.3  ${user}-${name}.nfs.0  ${user}-${name}.esx.0  ${user}-${name}.esx.1  ${user}-${name}.esx.2
-
-    Remove Environment Variable  GOVC_PASSWORD
-    Remove Environment Variable  GOVC_USERNAME
-    Set Environment Variable  GOVC_INSECURE  1
-    :FOR  ${ip}  IN  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}
-    \   Log To Console  Changing password for ${ip}
-    \   Set Environment Variable  GOVC_URL  root:@${ip}
-    \   Wait Until Keyword Succeeds  10x  3 minutes   Change ESXi Server Password  e2eFunctionalTest
-    \   Wait Until Keyword Succeeds  6x   10 sec      Check License Features
-
-    Set Environment Variable  GOVC_URL  ${vc1-ip}
-    Set Environment Variable  GOVC_USERNAME  administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Wait Until Keyword Succeeds  6x   10 sec  Check License Present
-
-    # First VC cluster
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ha-datacenter
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    :FOR  ${ip}  IN  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}
-    \    Log To Console  Adding ${ip} to VC
-    \    ${out}=  Run  govc cluster.add -hostname=${ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    \    Should Contain  ${out}  OK
-
-    Create A Distributed Switch  ha-datacenter
-
-    Create Three Distributed Port Groups  ha-datacenter
-
-    Add Host To Distributed Switch  /ha-datacenter/host/cls
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    # Second VC cluster
-    Set Environment Variable  GOVC_URL  ${vc2-ip}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ha-datacenter
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    :FOR  ${ip}  IN  @{esx-ips}
-    \    ${out}=  Run  govc cluster.add -hostname=${ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    \    Should Contain  ${out}  OK
-
-    Create A Distributed Switch  ha-datacenter
-
-    Create Three Distributed Port Groups  ha-datacenter
-
-    Add Host To Distributed Switch  /ha-datacenter/host/cls
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  GOVC_URL  ${vc1-ip}
-    Set Environment Variable  TEST_URL  ${vc1-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Set Environment Variable  OVA_NAME  OVA-5-03-TEST
-    Set Global Variable  ${OVA_USERNAME_ROOT}  root
-    Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
-
-    # pending steps:
-    #
-    # install OVA and initialize
-    # verify OVA components
-    # create VCH using wizard UI
-    # run docker commands
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-03-Multiple-Datacenter.md b/tests/test-cases/Group5-Interoperability-Tests/5-03-Multiple-Datacenter.md
deleted file mode 100644
index 0831f4708..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-03-Multiple-Datacenter.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 5-03 - Multiple Datacenter
-=======
-
-# Purpose:
-To verify the VIC OVA appliance works when the vCenter appliance has multiple datacenters
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with 3 different datacenters and a mix of ESX within the datacenters
-2. Install the VIC OVA appliance into one of the datacenters
-3. Run regression tests on the VIC OVA appliance and Wizard UI
-
-# Expected Outcome:
-The VIC OVA appliance should deploy without error and regression tests should pass
-
-# Possible Problems:
-None
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-03-Multiple-Datacenter.robot b/tests/test-cases/Group5-Interoperability-Tests/5-03-Multiple-Datacenter.robot
deleted file mode 100644
index 93894bf23..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-03-Multiple-Datacenter.robot
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2018 VMware, Inc. All Rights Reserved.
-#
-# 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
-
-*** Settings ***
-Documentation  Test 5-03 - Multiple Datacenters
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Multiple Datacenter Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-# Insert elements from dict2 into dict1, overwriting conflicts in dict1 & returning new dict
-Combine Dictionaries
-    [Arguments]  ${dict1}  ${dict2}
-    ${dict2keys}=  Get Dictionary Keys  ${dict2}
-    :FOR  ${key}  IN  @{dict2keys}
-    \    ${elem}=  Get From Dictionary  ${dict2}  ${key}
-    \    Set To Dictionary  ${dict1}  ${key}  ${elem}
-    [Return]  ${dict1}
-
-Multiple Datacenter Setup
-    [Timeout]    110 minutes
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    &{esxes}=  Create Dictionary
-    ${num_of_esxes}=  Evaluate  2
-    :FOR  ${i}  IN RANGE  3
-    # Deploy some ESXi instances
-    \    &{new_esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  ${num_of_esxes}  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    \    ${esxes}=  Combine Dictionaries  ${esxes}  ${new_esxes}
-
-    # Investigate to see how many were actually deployed
-    \    ${len}=  Get Length  ${esxes}
-    \    ${num_of_esxes}=  Evaluate  ${num_of_esxes} - ${len}
-
-    # Exit if we've got enough & continue loop if we don't
-    \    Exit For Loop If  ${len} >= 2
-    \    Log To Console  Only got ${len} ESXi instance(s); Trying again
-
-    @{esx-names}=  Get Dictionary Keys  ${esxes}
-    @{esx-ips}=  Get Dictionary Values  ${esxes}
-    ${esx1}=  Get From List  ${esx-names}  0
-    ${esx2}=  Get From List  ${esx-names}  1
-    ${esx1-ip}=  Get From List  ${esx-ips}  0
-    ${esx2-ip}=  Get From List  ${esx-ips}  1
-
-    ${esx3}  ${esx4}  ${esx5}  ${vc}  ${esx3-ip}  ${esx4-ip}  ${esx5-ip}  ${vc-ip}=  Create a Simple VC Cluster  datacenter1  cls1
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${esx4}  ${esx5}  %{NIMBUS_USER}-${vc}
-
-    Log To Console  Create datacenter2 on the VC
-    ${out}=  Run  govc datacenter.create datacenter2
-    Should Be Empty  ${out}
-    ${out}=  Run  govc host.add -hostname=${esx1-ip} -username=root -dc=datacenter2 -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Log To Console  Create datacenter3 on the VC
-    ${out}=  Run  govc datacenter.create datacenter3
-    Should Be Empty  ${out}
-    ${out}=  Run  govc host.add -hostname=${esx2-ip} -username=root -dc=datacenter3 -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Set Environment Variable  TEST_DATACENTER  /datacenter1
-    Set Environment Variable  GOVC_DATACENTER  /datacenter1
-
-    Set Environment Variable  TEST_URL  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_RESOURCE  %{TEST_DATACENTER}/host/cls1
-    Set Environment Variable  TEST_TIMEOUT  30m
-    Set Environment Variable  TEST_DATASTORE  
-
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Set Environment Variable  OVA_NAME  OVA-5-03-TEST
-    Set Global Variable  ${OVA_USERNAME_ROOT}  root
-    Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
-
-    # pending steps:
-    #
-    # install OVA and initialize
-    # verify OVA components
-    # verify wizard ui scenario
-
-    Remove Environment Variable  TEST_DATACENTER
-    Remove Environment Variable  GOVC_DATACENTER
-    
\ No newline at end of file
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-04-Multiple-Cluster.md b/tests/test-cases/Group5-Interoperability-Tests/5-04-Multiple-Cluster.md
deleted file mode 100644
index 098f14327..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-04-Multiple-Cluster.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 5-04 - Multiple Cluster
-=======
-
-# Purpose:
-To verify the VIC OVA appliance and Wizard UI works when the vCenter appliance has multiple clusters within the datacenter
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with 3 different clusters in a datacenter and a mix of ESX within the clusters
-2. Install the VIC OVA appliance
-3. Walk through completing the install and use the VCH creation wizard to create a VCH
-4. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH and VIC appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-04-Multiple-Cluster.robot b/tests/test-cases/Group5-Interoperability-Tests/5-04-Multiple-Cluster.robot
deleted file mode 100644
index e11195299..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-04-Multiple-Cluster.robot
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2018 VMware, Inc. All Rights Reserved.
-#
-# 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
-
-*** Settings ***
-Documentation  Test 5-04 - Multiple Clusters
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Multiple Cluster Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-# Insert elements from dict2 into dict1, overwriting conflicts in dict1 & returning new dict
-Combine Dictionaries
-    [Arguments]  ${dict1}  ${dict2}
-    ${dict2keys}=  Get Dictionary Keys  ${dict2}
-    :FOR  ${key}  IN  @{dict2keys}
-    \    ${elem}=  Get From Dictionary  ${dict2}  ${key}
-    \    Set To Dictionary  ${dict1}  ${key}  ${elem}
-    [Return]  ${dict1}
-
-Multiple Cluster Setup
-    [Timeout]    110 minutes
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    &{esxes}=  Create Dictionary
-    ${num_of_esxes}=  Evaluate  2
-    :FOR  ${i}  IN RANGE  3
-    # Deploy some ESXi instances
-    \    &{new_esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  ${num_of_esxes}  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    \    ${esxes}=  Combine Dictionaries  ${esxes}  ${new_esxes}
-
-    # Investigate to see how many were actually deployed
-    \    ${len}=  Get Length  ${esxes}
-    \    ${num_of_esxes}=  Evaluate  ${num_of_esxes} - ${len}
-
-    # Exit if we've got enough & continue loop if we don't
-    \    Exit For Loop If  ${len} >= 2
-    \    Log To Console  Only got ${len} ESXi instance(s); Trying again
-
-    @{esx-names}=  Get Dictionary Keys  ${esxes}
-    @{esx-ips}=  Get Dictionary Values  ${esxes}
-    ${esx1}=  Get From List  ${esx-names}  0
-    ${esx2}=  Get From List  ${esx-names}  1
-    ${esx1-ip}=  Get From List  ${esx-ips}  0
-    ${esx2-ip}=  Get From List  ${esx-ips}  1
-
-    ${esx3}  ${esx4}  ${esx5}  ${vc}  ${esx3-ip}  ${esx4-ip}  ${esx5-ip}  ${vc-ip}=  Create a Simple VC Cluster  datacenter1  cls1
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${esx4}  ${esx5}  %{NIMBUS_USER}-${vc}
-
-    Log To Console  Create cluster2 on the VC
-    ${out}=  Run  govc cluster.create cls2
-    Should Be Empty  ${out}
-    ${out}=  Run  govc cluster.add -hostname=${esx1-ip} -username=root -dc=datacenter1 -cluster=cls2 -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Log To Console  Create cluster3 on the VC
-    ${out}=  Run  govc cluster.create cls3
-    Should Be Empty  ${out}
-    ${out}=  Run  govc cluster.add -hostname=${esx2-ip} -username=root -dc=datacenter1 -cluster=cls3 -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Set Environment Variable  TEST_URL  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_RESOURCE  /datacenter1/host/cls1
-    Set Environment Variable  TEST_TIMEOUT  30m
-    Set Environment Variable  TEST_DATASTORE  datastore1
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Set Environment Variable  OVA_NAME  OVA-5-04-TEST
-    Set Global Variable  ${OVA_USERNAME_ROOT}  root
-    Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
-
-    # pending steps:
-    #
-    # install OVA and initialize
-    # verify OVA components
-    # install VCH using wizard UI
-    # run docker commands
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-06-1-VSAN-Simple.md b/tests/test-cases/Group5-Interoperability-Tests/5-06-1-VSAN-Simple.md
deleted file mode 100644
index f775a4963..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-06-1-VSAN-Simple.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 5-06-1 - VSAN-Simple
-=======
-
-# Purpose:
-To verify the VIC OVA appliance and Wizard UI works with VMware Virtual SAN
-
-# References:
-[1 - VMware Virtual SAN](http://www.vmware.com/products/virtual-san.html)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter in Nimbus:  
-```--testbedName test-vpx-4esx-virtual-fullInstall-vcva-8gbmem```  
-2. Install the VIC OVA appliance
-3. Walk through completing the install and use the VCH creation wizard to create a VCH
-4. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH and VIC appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-* None
\ No newline at end of file
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-06-1-VSAN-Simple.robot b/tests/test-cases/Group5-Interoperability-Tests/5-06-1-VSAN-Simple.robot
deleted file mode 100644
index 2116dd1d1..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-06-1-VSAN-Simple.robot
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2018 VMware, Inc. All Rights Reserved.
-#
-# 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
-
-*** Settings ***
-Documentation  Test 5-6-1 - VSAN-Simple
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Simple VSAN Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-Simple VSAN Setup
-    [Timeout]    110 minutes
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${name}=  Evaluate  'vic-vsan-' + str(random.randint(1000,9999))  modules=random
-    Set Suite Variable  ${user}  %{NIMBUS_USER}
-    ${out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  --plugin testng --vcfvtBuildPath /dbc/pa-dbc1111/mhagen/ --noSupportBundles --vcvaBuild ${VC_VERSION} --esxPxeDir ${ESX_VERSION} --esxBuild ${ESX_VERSION} --testbedName vic-vsan-simple-pxeBoot-vcva --runName ${name}
-    Should Contain  ${out}  "deployment_result"=>"PASS"
-    ${out}=  Split To Lines  ${out}
-    :FOR  ${line}  IN  @{out}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  .vcva-${VC_VERSION}' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${vc-ip}  ${ip}
-    \   Exit For Loop If  ${status}
-
-    Set Suite Variable  @{list}  ${user}-${name}.vcva-${VC_VERSION}  ${user}-${name}.esx.0  ${user}-${name}.esx.1  ${user}-${name}.esx.2  ${user}-${name}.esx.3  ${user}-${name}.nfs.0  ${user}-${name}.iscsi.0
-
-    Log To Console  Set environment variables up for GOVC
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-
-    Add Host To Distributed Switch  /vcqaDC/host/cls
-
-    Log To Console  Enable DRS and VSAN on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /vcqaDC/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  vsanDatastore
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  15m
-
-*** Test Cases ***
-Simple VSAN
-    Log To Console  \nStarting test...
-    Set Environment Variable  OVA_NAME  OVA-5-06-1-TEST
-    Set Global Variable  ${OVA_USERNAME_ROOT}  root
-    Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
-
-    ${out}=  Run  govc datastore.vsan.dom.ls -ds %{TEST_DATASTORE} -l -o
-    Should Be Empty  ${out}
-
-    Custom Testbed Keepalive  /dbc/pa-dbc1111/mhagen
-
-    # pending steps:
-    #
-    # install OVA and initialize
-    # verify OVA components
-    # create VCH using wizard UI
-    # run docker commands
-    # cleanup
-
-    ${out}=  Run  govc datastore.vsan.dom.ls -ds %{TEST_DATASTORE} -l -o
-    Should Be Empty  ${out}
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-08-DRS.md b/tests/test-cases/Group5-Interoperability-Tests/5-08-DRS.md
deleted file mode 100644
index eb77b2cd5..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-08-DRS.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 5-8 - DRS
-=======
-
-# Purpose:
-To verify the VIC appliance created using Wizard UI detects when DRS should be enabled and fuctions properly when used with DRS
-
-# References:
-[1 - Managing DRS Clusters](https://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.pg.doc_50%2FPG_Ch13_Resources.15.8.html)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with 3 ESXi hosts in a cluster but with DRS disabled
-2. Attempt to install a VCH appliance using wizard UI into the cluster
-3. Enable DRS on the cluster
-4. Re-attempt to install a VCH appliance using wizard UI into the cluster
-5. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The first VCH appliance install should provide an error indicating that DRS must be enabled, the second VCH appliance install should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-08-DRS.robot b/tests/test-cases/Group5-Interoperability-Tests/5-08-DRS.robot
deleted file mode 100644
index 2ecd938d2..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-08-DRS.robot
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2018 VMware, Inc. All Rights Reserved.
-#
-# 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
-
-*** Settings ***
-Documentation  Test 5-8 - DRS
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  DRS Setup
-Suite Teardown  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-DRS Setup
-    [Timeout]    110 minutes
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${esx1}  ${esx1-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX1}  ${esx1}
-    ${esx2}  ${esx2-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX2}  ${esx2}
-    ${esx3}  ${esx3-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX3}  ${esx3}
-
-    ${vc}  ${vc-ip}=  Deploy Nimbus vCenter Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${VC}  ${vc}
-
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${vc}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ha-datacenter
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    ${out}=  Wait Until Keyword Succeeds  5x  15 seconds  Run  govc cluster.add -hostname=${esx1-ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Wait Until Keyword Succeeds  5x  15 seconds  Run  govc cluster.add -hostname=${esx2-ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Wait Until Keyword Succeeds  5x  15 seconds  Run  govc cluster.add -hostname=${esx3-ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Log To Console  Create a distributed switch
-    ${out}=  Run  govc dvs.create -dc=ha-datacenter test-ds
-    Should Contain  ${out}  OK
-
-    Log To Console  Create three new distributed switch port groups for management and vm network traffic
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=ha-datacenter -dvs=test-ds management
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=ha-datacenter -dvs=test-ds vm-network
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=ha-datacenter -dvs=test-ds bridge
-    Should Contain  ${out}  OK
-
-    Log To Console  Add all the hosts to the distributed switch
-    Wait Until Keyword Succeeds  5x  5min  Add Host To Distributed Switch  /ha-datacenter/host/cls
-
-    Set Environment Variable  TEST_URL  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Set Environment Variable  OVA_NAME  OVA-5-02-TEST
-    Set Global Variable  ${OVA_USERNAME_ROOT}  root
-    Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
-
-    # pending steps:
-    #
-    # install OVA and initialize
-    # verify OVA components
-    # try creating VCH using wizard UI which should fail as expected
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    # pending steps:
-    #
-    # create VCH using wizard UI
-    # run docker commands
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-12-Multiple-VLAN.md b/tests/test-cases/Group5-Interoperability-Tests/5-12-Multiple-VLAN.md
deleted file mode 100644
index 8dd405556..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-12-Multiple-VLAN.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Test 5-12 - Multiple VLAN
-=======
-
-# Purpose:
-To verify the VIC OVA appliance and Wizard UI works when the vCenter appliance has multiple portgroups on different VLANs within the datacenter
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with a distributed virtual switch with 3 portgroups on all different VLANs
-2. Install the VIC OVA appliance
-3. Walk through completing the install and use the VCH creation wizard to create a VCH
-4. Run a variety of docker commands on the VCH appliance
-5. Uninstall the VIC appliance
-6. Update vCenter to have two portgroups on the same VLAN and one on a different VLAN
-7. Install the VIC OVA appliance into one of the clusters
-8. Walk through completing the install and use the VCH creation wizard to create a VCH
-9. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH and VIC appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-12-Multiple-VLAN.robot b/tests/test-cases/Group5-Interoperability-Tests/5-12-Multiple-VLAN.robot
deleted file mode 100644
index 18245f4aa..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-12-Multiple-VLAN.robot
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2018 VMware, Inc. All Rights Reserved.
-#
-# 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
-
-*** Settings ***
-Documentation  Test 5-12 - Multiple VLAN
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Multiple VLAN Setup And Install OVA With UI Plugin
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-# pending test teardown:
-# cleanup VIC
-
-*** Keywords ***
-Multiple VLAN Setup And Install OVA With UI Plugin
-    [Timeout]    110 minutes
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc-ip}=  Create a Simple VC Cluster  multi-vlan-1  cls
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_USER}-${vc}
-
-    Set Environment Variable  TEST_URL  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_RESOURCE  /datacenter1/host/cls1
-    Set Environment Variable  TEST_TIMEOUT  30m
-    Set Environment Variable  TEST_DATASTORE  datastore1
-
-    Set Environment Variable  OVA_NAME  OVA-5-12-TEST
-    Set Global Variable  ${OVA_USERNAME_ROOT}  root
-    Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
-
-*** Test Cases ***
-Test1
-    Log To Console  \nStarting test1...
-    ${out}=  Run  govc dvs.portgroup.change -vlan 1 bridge
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.change -vlan 1 management
-    Should Contain  ${out}  OK
-
-    # pending steps:
-    #
-    # install OVA and initialize
-    # verify OVA components
-    # create VCH using wizard UI
-    # run docker commands
-
-Test2
-    Log To Console  \nStarting test2...
-    ${out}=  Run  govc dvs.portgroup.change -vlan 1 bridge
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.change -vlan 2 management
-    Should Contain  ${out}  OK
-
-    # pending steps:
-    #
-    # install OVA and initialize
-    # verify OVA components
-    # create VCH using wizard UI
-    # run docker commands
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-15-NFS-Datastore.md b/tests/test-cases/Group5-Interoperability-Tests/5-15-NFS-Datastore.md
deleted file mode 100644
index 9508e172c..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-15-NFS-Datastore.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Test 5-15 - NFS Datastore
-=======
-
-# Purpose:
-To verify that VIC OVA and Wizard UI works properly when installed on an NFS based datastore
-
-# References:
-[1 - Best practices for running VMware vSphere on NFS](http://www.vmware.com/content/dam/digitalmarketing/vmware/en/pdf/techpaper/vmware-nfs-bestpractices-white-paper-en.pdf)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with a simple cluster
-2. Deploy an NFS server
-3. Create a new datastore out of a NFS share on the NFS server
-4. Install the VIC OVA appliance
-5. Walk through completing the install and use the VCH creation wizard to create a VCH
-6. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH and VIC appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/tests/test-cases/Group5-Interoperability-Tests/5-15-NFS-Datastore.robot b/tests/test-cases/Group5-Interoperability-Tests/5-15-NFS-Datastore.robot
deleted file mode 100644
index 0cdaaf8d1..000000000
--- a/tests/test-cases/Group5-Interoperability-Tests/5-15-NFS-Datastore.robot
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2018 VMware, Inc. All Rights Reserved.
-#
-# 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
-
-*** Settings ***
-Documentation  Test 5-15 - NFS Datastore
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  NFS Datastore Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-NFS Datastore Setup
-    [Timeout]    110 minutes
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc-ip}=  Create a Simple VC Cluster  datacenter1  cls1
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_USER}-${vc}
-
-    ${name}  ${ip}=  Deploy Nimbus NFS Datastore  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Append To List  ${list}  ${name}
-
-    ${out}=  Run  govc datastore.create -mode readWrite -type nfs -name nfsDatastore -remote-host ${ip} -remote-path /store /datacenter1/host/cls1
-    Should Be Empty  ${out}
-
-    Set Environment Variable  TEST_DATASTORE  nfsDatastore
-    Set Environment Variable  TEST_URL  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_RESOURCE  /datacenter1/host/cls1
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Set Environment Variable  OVA_NAME  OVA-5-15-TEST
-    Set Global Variable  ${OVA_USERNAME_ROOT}  root
-    Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
-
-    # pending steps:
-    #
-    # install OVA and initialize
-    # verify OVA components
-    # create VCH using wizard UI
-    # run docker commands