diff --git a/tools/test/cells/tom b/tools/test/cells/tom
index 9db8758..cba30f3 100644
--- a/tools/test/cells/tom
+++ b/tools/test/cells/tom
@@ -1,8 +1,8 @@
 # Thomas' VirtualBox-based single ONOS instance & ONOS mininet box
 
 export ONOS_NIC=192.168.56.*
-export OC1="192.168.56.101"
-export OCN="192.168.56.103"
+export OC1="192.168.56.11"
+export OCN="192.168.56.7"
 export OCI="${OC1}"
 
-export ONOS_FEATURES=webconsole,onos-api,onos-core-trivial,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-proxyarp,onos-app-optical
+export ONOS_FEATURES=webconsole,onos-api,onos-core-trivial,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-proxyarp,onos-app-mobility
diff --git a/tools/test/cells/tom3 b/tools/test/cells/tom3
new file mode 100644
index 0000000..17d64be
--- /dev/null
+++ b/tools/test/cells/tom3
@@ -0,0 +1,10 @@
+# Thomas' VirtualBox-based 3 ONOS instances & ONOS mininet box
+
+export ONOS_NIC=192.168.56.*
+export OC1="192.168.56.11"
+export OC2="192.168.56.12"
+export OC3="192.168.56.13"
+export OCN="192.168.56.7"
+export OCI="${OC1}"
+
+export ONOS_FEATURES=webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-proxyarp,onos-app-mobility