diff --git a/voltha b/voltha
index f2bb166..2233f89 100755
--- a/voltha
+++ b/voltha
@@ -1484,7 +1484,7 @@
     if [ $TYPE == "minimal" ]; then
         EXPECT=$((EXPECT+2))
     else
-        EXPECT=$((EXPECT+6))
+        EXPECT=$((EXPECT+4))
     fi
 fi
 bspin "Verify VOLTHA installed $HIGH_VOLTAGE"
@@ -1497,9 +1497,7 @@
 INTERNAL_EXTRA_HELM_INSTALL_ARGS=
 
 VOLTHA="voltha-ofagent-.* \
-    ro-core.* \
     rw-core.* \
-    voltha-api-server-.* \
     voltha-etcd-cluster-.* \
     voltha-kafka-.* \
     voltha-zookeeper-.*"