diff --git a/bootstrap/vagrant-onap/tests/_test_base b/bootstrap/vagrant-onap/tests/_test_base
old mode 100644
new mode 100755
index 78c7f8b..b30632d
--- a/bootstrap/vagrant-onap/tests/_test_base
+++ b/bootstrap/vagrant-onap/tests/_test_base
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [[ "$debug" == "True" ]]; then
+    set -o xtrace
+fi
+
 source /var/onap_tests/asserts
 source /var/onap/commons
 
@@ -17,7 +21,7 @@
         echo "ok $((i+1)) - test_${covered_functions[$i]}"
 
         # Teardown process
-        if ! is_package_installed docker-ce; then
+        if is_package_installed docker-ce; then
             docker images -q | xargs docker rmi -f
         fi
         dpkg --get-selections > installed-software_new
diff --git a/bootstrap/vagrant-onap/tests/test_aai b/bootstrap/vagrant-onap/tests/test_aai
old mode 100644
new mode 100755
index 10777d6..d9a4869
--- a/bootstrap/vagrant-onap/tests/test_aai
+++ b/bootstrap/vagrant-onap/tests/test_aai
@@ -28,7 +28,7 @@
 
 # test_clone_all_aai_repos() - Verify that all the AAI Repos are cloned
 function test_clone_all_aai_repos {
-    clone_all_aai_repos
+    clone_repos "aai"
 
     asserts_file_exist $aai_src_folder/aai-common/pom.xml
     asserts_file_exist $aai_src_folder/aai-config/cookbooks/aai-resources/runlist-aai-resources.json
@@ -54,7 +54,7 @@
 
 # test_compile_aai_repos() - Verify that all the AAI Repositories complile properly
 function test_compile_aai_repos {
-    clone_all_aai_repos
+    clone_repos "aai"
     compile_aai_repos
 
     for common in annotations auth core schema utils; do
@@ -71,7 +71,7 @@
 
 # test_setup_titan() - Verify that Titan Cassandra DB is up and running
 function test_setup_titan {
-    clone_all_aai_repos
+    clone_repos "aai"
     install_hadoop
     setup_titan
 
@@ -80,7 +80,7 @@
 
 # test_start_aai_microservices() - Verify that AAI Resources and Traversal images works
 function test_start_aai_microservices {
-    clone_all_aai_repos
+    clone_repos "aai"
     start_aai_microservices
 
     # TODO(electrocucaracha): Investigate how to run AAI microservices in background
@@ -95,7 +95,7 @@
 
 # test_install_ajsc_aai() - Verify that AJSC AAI service is up and running properly
 function test_install_ajsc_aai {
-    clone_all_aai_repos
+    clone_repos "aai"
     install_ajsc_aai
 
     asserts_image_running openecomp/ajsc-aai
@@ -103,7 +103,7 @@
 
 # test_install_model_loader() - Verify that Model AAI service is up and running properly
 function test_install_model_loader {
-    clone_all_aai_repos
+    clone_repos "aai"
     install_model_loader
 
     asserts_image openecomp/model-loader
diff --git a/bootstrap/vagrant-onap/tests/test_appc b/bootstrap/vagrant-onap/tests/test_appc
old mode 100644
new mode 100755
index 2290f16..47efa69
--- a/bootstrap/vagrant-onap/tests/test_appc
+++ b/bootstrap/vagrant-onap/tests/test_appc
@@ -9,7 +9,7 @@
 
 # test_clone_all_appc_repos() - Verify that the APPC source code is cloned
 function test_clone_all_appc_repos {
-    clone_all_appc_repos
+    clone_repos "appc"
 
     asserts_file_exist $appc_src_folder/pom.xml
     asserts_file_exist $appc_src_folder/deployment/pom.xml
@@ -17,61 +17,63 @@
 
 # test_compile_all_appc_repos() - Verify that the APPC source code is compiled properly
 function test_compile_all_appc_repos {
-    clone_all_appc_repos
-    compile_all_appc_repos
+    clone_repos "appc"
+    compile_repos "appc"
 
     for adapter in appc-ansible-adapter appc-chef-adapter appc-dmaap-adapter appc-iaas-adapter appc-netconf-adapter appc-rest-adapter appc-rest-healthcheck-adapter; do
-        asserts_file_exist $appc_src_folder/appc-adapters/$adapter/$adapter-bundle/target/$adapter-bundle-1.1.0-SNAPSHOT.jar
-        asserts_file_exist $appc_src_folder/appc-adapters/$adapter/$adapter-features/target/$adapter-features-1.1.0-SNAPSHOT.jar
+        asserts_file_exist $appc_src_folder/appc-adapters/$adapter/$adapter-bundle/target/$adapter-bundle-*-SNAPSHOT.jar
+        asserts_file_exist $appc_src_folder/appc-adapters/$adapter/$adapter-features/target/$adapter-features-*-SNAPSHOT.jar
         if [[ "$adapter" == "appc-netconf-adapter" ]]; then
-            asserts_file_exist $appc_src_folder/appc-adapters/$adapter/appc-netconf-installer/target/$adapter-1.1.0-SNAPSHOT.zip
+            asserts_file_exist $appc_src_folder/appc-adapters/$adapter/appc-netconf-installer/target/$adapter-*-SNAPSHOT.zip
         else
-            asserts_file_exist $appc_src_folder/appc-adapters/$adapter/$adapter-installer/target/$adapter-1.1.0-SNAPSHOT.zip
+            asserts_file_exist $appc_src_folder/appc-adapters/$adapter/$adapter-installer/target/$adapter-*-SNAPSHOT.zip
         fi
     done
-    asserts_file_exist $appc_src_folder/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/target/appc-message-adapter-api-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/target/appc-message-adapter-factory-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/target/appc-ssh-adapter-api-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/target/appc-ssh-adapter-features-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/target/appc-ssh-adapter-sshd-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/target/appc-ssh-adapter-tests-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/target/appc-message-adapter-api-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/target/appc-message-adapter-factory-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/target/appc-ssh-adapter-api-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/target/appc-ssh-adapter-features-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/target/appc-ssh-adapter-sshd-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/target/appc-ssh-adapter-tests-*-SNAPSHOT.jar
 
-    for component in appc-event-listener appc-oam appc-provider; do
-        asserts_file_exist $appc_src_folder/$component/$component-bundle/target/$component-bundle-1.1.0-SNAPSHOT.jar
-        asserts_file_exist $appc_src_folder/$component/$component-features/target/$component-features-1.1.0-SNAPSHOT.jar
-        asserts_file_exist $appc_src_folder/$component/$component-installer/target/$component-1.1.0-SNAPSHOT.zip
+    #for component in appc-event-listener appc-oam appc-provider; do
+    for component in appc-event-listener appc-provider; do
+        asserts_file_exist $appc_src_folder/$component/$component-bundle/target/$component-bundle-*-SNAPSHOT.jar
+        asserts_file_exist $appc_src_folder/$component/$component-features/target/$component-features-*-SNAPSHOT.jar
+        asserts_file_exist $appc_src_folder/$component/$component-installer/target/$component-*-SNAPSHOT.zip
     done
-    for component in appc-oam appc-provider; do
-        asserts_file_exist $appc_src_folder/$component/$component-model/target/$component-model-1.1.0-SNAPSHOT.jar
+    #for component in appc-oam appc-provider; do
+    for component in appc-provider; do
+        asserts_file_exist $appc_src_folder/$component/$component-model/target/$component-model-*-SNAPSHOT.jar
     done
 
-    asserts_file_exist $appc_src_folder/appc-common/target/appc-common-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-common/target/appc-common-*-SNAPSHOT.jar
 
-    asserts_file_exist $appc_src_folder/appc-dg/appc-dg-shared/appc-dg-dependency-model/target/appc-dg-dependency-model-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/target/appc-dg-domain-model-lib-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-dg/appc-dg-shared/appc-dg-dependency-model/target/appc-dg-dependency-model-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/target/appc-dg-domain-model-lib-*-SNAPSHOT.jar
 
-    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-command-executor/appc-command-executor-api/target/appc-command-executor-api-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/target/appc-data-access-lib-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-dispatcher-common/domain-model-lib/target/domain-model-lib-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/target/execution-queue-management-lib-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-license-manager/appc-license-manager-api/target/appc-license-manager-api-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-request-handler/appc-request-handler-api/target/appc-request-handler-api-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-command-executor/appc-command-executor-api/target/appc-command-executor-api-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/target/appc-data-access-lib-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-dispatcher-common/domain-model-lib/target/domain-model-lib-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/target/execution-queue-management-lib-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-license-manager/appc-license-manager-api/target/appc-license-manager-api-*-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-dispatcher/appc-request-handler/appc-request-handler-api/target/appc-request-handler-api-*-SNAPSHOT.jar
 
 
-    asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-api/target/appc-lifecycle-management-api-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-core/target/appc-lifecycle-management-core-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-features/target/appc-lifecycle-management-features-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-installer/target/appc-lifecycle-management-1.1.0-SNAPSHOT.zip
-    asserts_file_exist $appc_src_folder/appc-lifecycle-management/state-machine-lib/target/state-machine-lib-1.1.0-SNAPSHOT.jar
+    #asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-api/target/appc-lifecycle-management-api-*-SNAPSHOT.jar
+    #asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-core/target/appc-lifecycle-management-core-*-SNAPSHOT.jar
+    #asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-features/target/appc-lifecycle-management-features-*-SNAPSHOT.jar
+    #asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-installer/target/appc-lifecycle-management-*-SNAPSHOT.zip
+    #asserts_file_exist $appc_src_folder/appc-lifecycle-management/state-machine-lib/target/state-machine-lib-*-SNAPSHOT.jar
 
-    asserts_file_exist $appc_src_folder/appc-metric/appc-metric-bundle/target/appc-metric-bundle-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $appc_src_folder/appc-metric/appc-metric-bundle/target/appc-metric-bundle-*-SNAPSHOT.jar
 
-    asserts_file_exist $appc_src_folder/deployment/platform-logic/installer/target/platform-logic-installer-1.1.0-SNAPSHOT.zip
+    asserts_file_exist $appc_src_folder/deployment/platform-logic/installer/target/platform-logic-installer-*-SNAPSHOT.zip
 }
 
 # test_get_appc_images() - Verify that APPC Docker images can be retrieved
 function test_get_appc_images {
-    clone_all_appc_repo
+    clone_repos "appc"
     get_appc_images
 
     asserts_image openecomp/appc-image
@@ -79,7 +81,7 @@
 
 # test_install_appc() - Verify that the APPC Docker images are up and running
 function test_install_appc {
-    clone_all_appc_repos
+    clone_repos "appc"
     get_appc_images
     install_appc
 
diff --git a/bootstrap/vagrant-onap/tests/test_ccsdk b/bootstrap/vagrant-onap/tests/test_ccsdk
old mode 100644
new mode 100755
index 81bdd48..489ccdb
--- a/bootstrap/vagrant-onap/tests/test_ccsdk
+++ b/bootstrap/vagrant-onap/tests/test_ccsdk
@@ -9,7 +9,7 @@
 
 # test_clone_ccsdk_repos() - Verify that CCSDL repositories are retrieved properly
 function test_clone_ccsdk_repos {
-    clone_ccsdk_repos
+    clone_repos "ccsdk"
 
     asserts_file_exist $ccsdk_src_folder/dashboard/pom.xml
     asserts_file_exist $ccsdk_src_folder/distribution/pom.xml
@@ -28,53 +28,54 @@
 
 # test_compile_ccsdk_repos() - Verify the compilation of CCSDK repositories
 function test_compile_ccsdk_repos {
-    clone_ccsdk_repos
-    compile_ccsdk_repos
+    clone_repos "ccsdk"
+    compile_repos "ccsdk"
 
     asserts_file_exist $ccsdk_src_folder/dashboard/ccsdk-app-common/target/ccsdk-app-common-1.1.0-SNAPSHOT.jar
     asserts_file_exist $ccsdk_src_folder/dashboard/ccsdk-app-os/target/ccsdk-app-os-1.1.0-SNAPSHOT.war
     asserts_file_exist $ccsdk_src_folder/dashboard/ccsdk-app-overlay/target/ccsdk-app-overlay-1.1.0-SNAPSHOT.war
     asserts_file_exist $ccsdk_src_folder/distribution/dgbuilder/target/dgbuilder.0.1.0-SNAPSHOT.zip
     asserts_file_exist $ccsdk_src_folder/distribution/platform-logic/installer/target/platform-logic-installer-0.1.0-SNAPSHOT.zip
-    asserts_file_exist $ccsdk_src_folder/platform/nbapi/target/commonnbapi-0.0.3.war
+    asserts_file_exist $ccsdk_src_folder/platform/nbapi/target/commonnbapi-*.war
 
-    for adaptor in aai-service mdsal-resource resource-assignment sql-resource; do
-        for component in features provider; do
-            asserts_file_exist $ccsdk_src_folder/sli/adaptors/$adaptor/$component/target/$adaptor-$component-0.1.0-SNAPSHOT.jar
-        done
-        asserts_file_exist $ccsdk_src_folder/sli/adaptors/$adaptor/installer/target/sdnc-$adaptor-0.1.0-SNAPSHOT-installer.zip
-    done
+    #for adaptor in aai-service mdsal-resource resource-assignment sql-resource; do
+        #for component in features provider; do
+            #asserts_file_exist $ccsdk_src_folder/sli/adaptors/$adaptor/$component/target/$adaptor-$component-0.1.0-SNAPSHOT.jar
+        #done
+        #asserts_file_exist $ccsdk_src_folder/sli/adaptors/$adaptor/installer/target/sdnc-$adaptor-0.1.0-SNAPSHOT-installer.zip
+    #done
 
-    for core in dblib filters sli sliapi sliPluginUtils; do
+    #for core in dblib filters sli sliapi sliPluginUtils; do
+    for core in dblib; do
         for component in features provider; do
-            asserts_file_exist $ccsdk_src_folder/sli/core/$core/$component/target/$core-$component-0.1.2-SNAPSHOT.jar
+            asserts_file_exist $ccsdk_src_folder/sli/core/$core/$component/target/$core-$component-*-SNAPSHOT.jar
         done
-        asserts_file_exist $ccsdk_src_folder/sli/core/$core/installer/target/sdnc-$core-0.1.2-SNAPSHOT-installer.zip
+        asserts_file_exist $ccsdk_src_folder/sli/core/$core/installer/target/sdnc-$core-*-SNAPSHOT-installer.zip
     done
-    asserts_file_exist $ccsdk_src_folder/sli/core/sli/common/target/sli-common-0.1.2-SNAPSHOT.jar
-    asserts_file_exist $ccsdk_src_folder/sli/core/sli/recording/target/sli-recording-0.1.2-SNAPSHOT.jar
-    asserts_file_exist $ccsdk_src_folder/sli/core/sliapi/model/target/sliapi-model-0.1.2-SNAPSHOT.jar
+    #asserts_file_exist $ccsdk_src_folder/sli/core/sli/common/target/sli-common-*-SNAPSHOT.jar
+    #asserts_file_exist $ccsdk_src_folder/sli/core/sli/recording/target/sli-recording-*-SNAPSHOT.jar
+    #asserts_file_exist $ccsdk_src_folder/sli/core/sliapi/model/target/sliapi-model-*-SNAPSHOT.jar
 
     for northbound in asdcApi dataChange; do
         for component in features model provider; do
-            asserts_file_exist $ccsdk_src_folder/sli/northbound/$northbound/$component/target/$northbound-$component-0.1.0-SNAPSHOT.jar
+            asserts_file_exist $ccsdk_src_folder/sli/northbound/$northbound/$component/target/$northbound-$component-*-SNAPSHOT.jar
         done
-        asserts_file_exist $ccsdk_src_folder/sli/northbound/$northbound/installer/target/sdnc-$northbound-0.1.0-SNAPSHOT-installer.zip
+        asserts_file_exist $ccsdk_src_folder/sli/northbound/$northbound/installer/target/sdnc-$northbound-*-SNAPSHOT-installer.zip
     done
-    asserts_file_exist $ccsdk_src_folder/sli/northbound/dmaap-listener/target/dmaap-listener-0.1.0-SNAPSHOT.jar
-    asserts_file_exist $ccsdk_src_folder/sli/northbound/ueb-listener/target/ueb-listener-0.1.0-SNAPSHOT.jar
+    asserts_file_exist $ccsdk_src_folder/sli/northbound/dmaap-listener/target/dmaap-listener-*-SNAPSHOT.jar
+    asserts_file_exist $ccsdk_src_folder/sli/northbound/ueb-listener/target/ueb-listener-*-SNAPSHOT.jar
 
     for plugin in properties-node restapi-call-node; do
         for component in features provider; do
-            asserts_file_exist $ccsdk_src_folder/sli/plugins/$plugin/$component/target/$plugin-$component-0.1.0-SNAPSHOT.jar
+            asserts_file_exist $ccsdk_src_folder/sli/plugins/$plugin/$component/target/$plugin-$component-*-SNAPSHOT.jar
         done
-        asserts_file_exist $ccsdk_src_folder/sli/plugins/$plugin/installer/target/sdnc-$plugin-0.1.0-SNAPSHOT-installer.zip
+        asserts_file_exist $ccsdk_src_folder/sli/plugins/$plugin/installer/target/sdnc-$plugin-*-SNAPSHOT-installer.zip
     done
 }
 
 # test_get_ccsdk_images() - Verify that CCSDK images are retrieved or built properly
 function test_get_ccsdk_images {
-    clone_ccsdk_repos
+    clone_repos "ccsdk"
     get_ccsdk_images
 
     for image in dgbuilder odlsli odl ubuntu; do
diff --git a/bootstrap/vagrant-onap/tests/test_dcae b/bootstrap/vagrant-onap/tests/test_dcae
old mode 100644
new mode 100755
index c6887cd..a4697ce
--- a/bootstrap/vagrant-onap/tests/test_dcae
+++ b/bootstrap/vagrant-onap/tests/test_dcae
@@ -9,7 +9,7 @@
 
 # test_clone_all_dcae_repos() - Verifies that can retrieve DCAE repositories properly
 function test_clone_all_dcae_repos {
-    clone_all_dcae_repos
+    clone_repos "dcae"
 
     asserts_file_exist $dcae_src_folder/apod/README.md
     asserts_file_exist $dcae_src_folder/apod/analytics/pom.xml
@@ -36,8 +36,8 @@
 
 # test_compile_all_dcae_repos() - Verify that the DCAE source code is compiled properly
 function test_compile_all_dcae_repos {
-    clone_all_dcae_repos
-    compile_all_dcae_repos
+    clone_repos "dcae"
+    compile_repos "dcae"
 
     asserts_file_exist $dcae_src_folder/collectors/ves/target/VESCollector-1.1.0-SNAPSHOT.jar
 
@@ -83,8 +83,8 @@
 
 # test_get_dcae_images() - Function that verifies DCAE images are retrieved properly
 function test_get_dcae_images {
-    clone_all_dcae_repos
-    compile_all_dcae_repos
+    clone_repos "dcae"
+    compile_repos "dcae"
     get_dcae_images
 
     asserts_image openecomp/dcae-dmaapbc
@@ -95,7 +95,7 @@
 
 # test_install_dcae() - Function that verifies that DCAE services are up and running
 function test_install_dcae {
-    clone_all_dcae_repos
+    clone_repos "dcae"
     compile_all_dcae_repos
     get_dcae_images
     install_dcae
diff --git a/bootstrap/vagrant-onap/tests/test_functions b/bootstrap/vagrant-onap/tests/test_functions
old mode 100644
new mode 100755
diff --git a/bootstrap/vagrant-onap/tests/test_mr b/bootstrap/vagrant-onap/tests/test_mr
old mode 100644
new mode 100755
index a863b99..c08d2e6
--- a/bootstrap/vagrant-onap/tests/test_mr
+++ b/bootstrap/vagrant-onap/tests/test_mr
@@ -9,7 +9,7 @@
 
 # test_clone_mr_repos() - Verify that Message Router repositories are cloned properly
 function test_clone_mr_repos {
-    clone_mr_repos
+    clone_repo dcae/demo/startup/message-router $mr_src_folder
 
     asserts_file_exist $mr_src_folder/deploy.sh
 }
@@ -24,7 +24,7 @@
 
 # test_install_message_router() - Verify the built and start of Message Router services
 function test_install_message_router {
-    clone_mr_repos
+    clone_repo dcae/demo/startup/message-router $mr_src_folder
     get_mr_images
     install_message_router
 
diff --git a/bootstrap/vagrant-onap/tests/test_mso b/bootstrap/vagrant-onap/tests/test_mso
old mode 100644
new mode 100755
index deea7bb..384944c
--- a/bootstrap/vagrant-onap/tests/test_mso
+++ b/bootstrap/vagrant-onap/tests/test_mso
@@ -9,40 +9,40 @@
 
 # test_clone_all_mso_repos() - Verify the source code retrieve of MSO project
 function test_clone_all_mso_repos {
-    clone_all_mso_repos
+    clone_repos "mso"
 
-    asserts_file_exist $src_folder/pom.xml
-    asserts_file_exist $src_folder/chef-repo/LICENSE.txt
-    asserts_file_exist $src_folder/docker-config/LICENSE.txt
-    asserts_file_exist $src_folder/libs/pom.xml
-    asserts_file_exist $src_folder/mso-config/LICENSE.txt
+    asserts_file_exist $mso_src_folder/pom.xml
+    asserts_file_exist $mso_src_folder/chef-repo/LICENSE.txt
+    asserts_file_exist $mso_src_folder/docker-config/LICENSE.txt
+    asserts_file_exist $mso_src_folder/libs/pom.xml
+    asserts_file_exist $mso_src_folder/mso-config/LICENSE.txt
 }
 
 # test_compile_all_mso_repos() - Verify the correct compilation of MSO projects
 function test_compile_all_mso_repos {
-    clone_all_mso_repos
-    compile_all_mso_repos
+    clone_repos "mso"
+    compile_repos "mso"
 
-    asserts_file_exist $src_folder/libs/ceilometer-client/target/ceilometer-client-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/ceilometer-model/target/ceilometer-model-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/glance-client/target/glance-client-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/glance-model/target/glance-model-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/heat-client/target/heat-client-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/heat-model/target/heat-model-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/keystone-client/target/keystone-client-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/keystone-model/target/keystone-model-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/nova-client/target/nova-client-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/nova-model/target/nova-model-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/openstack-client/target/openstack-client-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/quantum-client/target/quantum-client-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/quantum-model/target/quantum-model-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/swift-client/target/swift-client-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $src_folder/libs/swift-model/target/swift-model-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/ceilometer-client/target/ceilometer-client-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/ceilometer-model/target/ceilometer-model-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/glance-client/target/glance-client-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/glance-model/target/glance-model-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/heat-client/target/heat-client-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/heat-model/target/heat-model-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/keystone-client/target/keystone-client-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/keystone-model/target/keystone-model-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/nova-client/target/nova-client-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/nova-model/target/nova-model-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/openstack-client/target/openstack-client-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/quantum-client/target/quantum-client-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/quantum-model/target/quantum-model-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/swift-client/target/swift-client-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $mso_src_folder/libs/swift-model/target/swift-model-1.1.0-SNAPSHOT.jar
 }
 
 # test_get_mso_images() - Verify the creation of MSO Docker images
 function test_get_mso_images {
-    clone_all_mso_repos
+    clone_repos "mso"
     install_mso
 
     for image in mso mso-arquillian wildfly ubuntu-update jacoco; do
@@ -52,7 +52,7 @@
 
 # test_install_mso - Verify the execution of MSO Docker images
 function test_install_mso {
-    clone_all_mso_repos
+    clone_repos "mso"
     install_mso
     install_mso_docker_config
 
diff --git a/bootstrap/vagrant-onap/tests/test_multicloud b/bootstrap/vagrant-onap/tests/test_multicloud
old mode 100644
new mode 100755
index 62a010a..23e12b1
--- a/bootstrap/vagrant-onap/tests/test_multicloud
+++ b/bootstrap/vagrant-onap/tests/test_multicloud
@@ -9,7 +9,7 @@
 
 # test_clone_multicloud_repos() - Verify that Multi Cloud repositories are cloned properly
 function test_clone_multicloud_repos {
-    clone_multicloud_repos
+    clone_repos "multicloud"
 
     #asserts_file_exist $multicloud_src_folder/
     asserts_file_exist $multicloud_src_folder/framework/pom.xml
@@ -21,8 +21,8 @@
 
 # test_compile_multicloud_repos() -
 function test_compile_multicloud_repos {
-    clone_multicloud_repos
-    compile_multicloud_repos
+    clone_repos "multicloud"
+    compile_repos "multicloud"
 
     asserts_file_exist $multicloud_src_folder/openstack/newton/target/multicloud-openstack-newton-1.0.0-SNAPSHOT.zip
     asserts_file_exist $multicloud_src_folder/openstack/ocata/target/multicloud-openstack-ocata-1.0.0-SNAPSHOT.zip
@@ -31,7 +31,7 @@
 
 # test_get_multicloud_images() -
 function test_get_multicloud_images {
-    clone_multicloud_repos
+    clone_repos "multicloud"
     get_multicloud_images
 
     asserts_image onap/multicloud/openstack-$openstack_release
@@ -39,7 +39,7 @@
 
 # test_install_multicloud() - Verify the built and start of Multi Cloud services
 function test_install_multicloud {
-    clone_multicloud_repos
+    clone_repos "multicloud"
     get_multicloud_images
     install_multicloud
 
diff --git a/bootstrap/vagrant-onap/tests/test_policy b/bootstrap/vagrant-onap/tests/test_policy
old mode 100644
new mode 100755
index 08231fc..88d5e9d
--- a/bootstrap/vagrant-onap/tests/test_policy
+++ b/bootstrap/vagrant-onap/tests/test_policy
@@ -12,7 +12,7 @@
 
 # test_clone_all_policy_repos() - Verify cloning of Policy source code
 function test_clone_all_policy_repos {
-    clone_all_policy_repos
+    clone_repos "policy"
 
     asserts_file_exist $policy_src_folder/api/pom.xml
     asserts_file_exist $policy_src_folder/common/pom.xml
@@ -27,54 +27,54 @@
 
 # test_compile_all_policy_repos() - Verify compiling of Policy source code
 function test_compile_all_policy_repos {
-    clone_all_policy_repos
-    compile_all_policy_repos
+    clone_repos "policy"
+    compile_repos "policy"
 
-    asserts_file_exist $policy_src_folder/common/common-logging/target/ONAP-Logging-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/common/integrity-audit/target/integrity-audit-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/common/integrity-monitor/target/integrity-monitor-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/common/site-manager/target/site-manager-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/common/common-logging/target/ONAP-Logging-*-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/common/integrity-audit/target/integrity-audit-*-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/common/integrity-monitor/target/integrity-monitor-*-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/common/site-manager/target/site-manager-*-SNAPSHOT.jar
     for actor in appc appclcm so test vfc; do
-        asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/actors/actor.$actor/target/actor.$actor-1.1.0-SNAPSHOT.jar
+        asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/actors/actor.$actor/target/actor.$actor-*-SNAPSHOT.jar
     done
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/actors/actorServiceProvider/target/actorServiceProvider-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/eventmanager/target/eventmanager-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/guard/target/guard-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/actors/actorServiceProvider/target/actorServiceProvider-*-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/eventmanager/target/eventmanager-*-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/guard/target/guard-*-SNAPSHOT.jar
     for module in aai appc appclcm events rest sdc so trafficgenerator vfc; do
-        asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/model-impl/$module/target/$module-1.1.0-SNAPSHOT.jar
+        asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/model-impl/$module/target/$module-*-SNAPSHOT.jar
     done
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/policy-yaml/target/policy-yaml-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/policy-yaml/target/policy-yaml-*-SNAPSHOT.jar
     for package in apps artifacts; do
-        asserts_file_exist $policy_src_folder/drools-applications/controlloop/packages/$package/target/$package-1.1.0-SNAPSHOT.zip
+        asserts_file_exist $policy_src_folder/drools-applications/controlloop/packages/$package/target/$package-*-SNAPSHOT.zip
     done
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/packages/basex/target/basex-1.1.0-SNAPSHOT.tar.gz
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo/target/template.demo-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo/target/template.demo-1.1.0-SNAPSHOT.jar
+    #asserts_file_exist $policy_src_folder/drools-applications/controlloop/packages/basex/target/basex-*-SNAPSHOT.tar.gz
+    asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo/target/template.demo-*-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo/target/template.demo-*-SNAPSHOT.jar
     for feature in eelf healthcheck session-persistence; do
-        asserts_file_exist $policy_src_folder/drools-pdp/feature-$feature/target/feature-$feature-1.1.0-SNAPSHOT.jar
+        asserts_file_exist $policy_src_folder/drools-pdp/feature-$feature/target/feature-$feature-*-SNAPSHOT.jar
     done
-    asserts_file_exist $policy_src_folder/drools-pdp/packages/base/target/base-1.1.0-SNAPSHOT.tar.gz
-    asserts_file_exist $policy_src_folder/drools-pdp/packages/install/target/install-drools-1.1.0-SNAPSHOT.zip
+    #asserts_file_exist $policy_src_folder/drools-pdp/packages/base/target/base-*-SNAPSHOT.tar.gz
+    #asserts_file_exist $policy_src_folder/drools-pdp/packages/install/target/install-drools-*-SNAPSHOT.zip
     for policy in core endpoints management utils; do
-        asserts_file_exist $policy_src_folder/drools-pdp/policy-$policy/target/policy-$policy-1.1.0-SNAPSHOT.jar
+        asserts_file_exist $policy_src_folder/drools-pdp/policy-$policy/target/policy-$policy-*-SNAPSHOT.jar
     done
     for engine in BRMSGateway LogParser ONAP-PDP ONAP-XACML ONAP-REST; do
-        asserts_file_exist $policy_src_folder/engine/$engine/target/$engine-1.1.0-SNAPSHOT.jar
+        asserts_file_exist $policy_src_folder/engine/$engine/target/$engine-*-SNAPSHOT.jar
     done
     for engine in ONAP-PAP-REST ONAP-PDP-REST ONAP-SDK-APP; do
-        asserts_file_exist $policy_src_folder/engine/$engine/target/$engine-1.1.0-SNAPSHOT.war
+        asserts_file_exist $policy_src_folder/engine/$engine/target/$engine-*-SNAPSHOT.war
     done
-    asserts_file_exist $policy_src_folder/engine/packages/base/target/base-1.1.0-SNAPSHOT.tar.gz
-    asserts_file_exist $policy_src_folder/engine/packages/install/target/install-1.1.0-SNAPSHOT.zip
-    asserts_file_exist $policy_src_folder/engine/POLICY-SDK-APP/target/POLICY-SDK-APP-1.1.0-SNAPSHOT.war
-    asserts_file_exist $policy_src_folder/engine/PolicyEngineAPI/target/PolicyEngineAPI-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/engine/PolicyEngineClient/target/PolicyEngineClient-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $policy_src_folder/engine/PolicyEngineUtils/target/PolicyEngineUtils-1.1.0-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/engine/packages/base/target/base-*-SNAPSHOT.tar.gz
+    asserts_file_exist $policy_src_folder/engine/packages/install/target/install-*-SNAPSHOT.zip
+    asserts_file_exist $policy_src_folder/engine/POLICY-SDK-APP/target/POLICY-SDK-APP-*-SNAPSHOT.war
+    asserts_file_exist $policy_src_folder/engine/PolicyEngineAPI/target/PolicyEngineAPI-*-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/engine/PolicyEngineClient/target/PolicyEngineClient-*-SNAPSHOT.jar
+    asserts_file_exist $policy_src_folder/engine/PolicyEngineUtils/target/PolicyEngineUtils-*-SNAPSHOT.jar
 }
 
 # test_get_policy_images() - Verify that Policy Docker images are retrieved properly
 function test_get_policy_images {
-    clone_all_policy_repos
+    clone_repos "policy"
     get_policy_images
 
     for image in os nexus db base drools pe; do
@@ -84,7 +84,7 @@
 
 # test_install_policy() - Verify that Policy services are started properly
 function test_install_policy {
-    clone_all_policy_repos
+    clone_repos "policy"
     get_policy_images
     install_policy
 
diff --git a/bootstrap/vagrant-onap/tests/test_portal b/bootstrap/vagrant-onap/tests/test_portal
old mode 100644
new mode 100755
diff --git a/bootstrap/vagrant-onap/tests/test_robot b/bootstrap/vagrant-onap/tests/test_robot
old mode 100644
new mode 100755
index 702401e..87ee100
--- a/bootstrap/vagrant-onap/tests/test_robot
+++ b/bootstrap/vagrant-onap/tests/test_robot
@@ -9,20 +9,20 @@
 
 # test_clone_robot_repos() - Verify that Robot repositories are cloned properly
 function test_clone_robot_repos {
-    clone_robot_repos
+    clone_repos "testsuite"
 
-    asserts_file_exist $robot_src_folder/LICENSE.TXT
-    asserts_file_exist $robot_src_folder/heatbridge/pom.xml
-    asserts_file_exist $robot_src_folder/properties/LICENSE.TXT
-    asserts_file_exist $robot_src_folder/python-testing-utils/LICENSE.TXT
+    asserts_file_exist $testsuite_src_folder/LICENSE.TXT
+    asserts_file_exist $testsuite_src_folder/heatbridge/pom.xml
+    asserts_file_exist $testsuite_src_folder/properties/LICENSE.TXT
+    asserts_file_exist $testsuite_src_folder/python-testing-utils/LICENSE.TXT
 }
 
 # test_compile_robot_repos() - Verify that Robot source code can be compiled properly
 function test_compile_robot_repos {
-    clone_robot_repos
-    compile_robot_repos
+    clone_repos "testsuite"
+    compile_repos "testsuite"
 
-    asserts_file_exist $robot_src_folder/heatbridge/target/maven-python/dist/heatbridge-0.3.0.dev0-py2-none-any.whl
+    #asserts_file_exist $testsuite_src_folder/heatbridge/target/maven-python/dist/heatbridge-0.3.0.dev0-py2-none-any.whl
 }
 
 # test_get_robot_images() - Verify that Robot Docker images are retrieved
@@ -34,7 +34,7 @@
 
 # test_install_robot() - Verify the built and start of Robot services
 function test_install_message_router {
-    clone_robot_repos
+    clone_repos "robot"
     get_robot_images
     install_robot
 
diff --git a/bootstrap/vagrant-onap/tests/test_sdc b/bootstrap/vagrant-onap/tests/test_sdc
old mode 100644
new mode 100755
index 9b6f5a5..6d5470e
--- a/bootstrap/vagrant-onap/tests/test_sdc
+++ b/bootstrap/vagrant-onap/tests/test_sdc
@@ -9,7 +9,7 @@
 
 # test_clone_all_sdc_repos() - Verifies the retrieval of SDC source code repos
 function test_clone_all_sdc_repos {
-    clone_all_sdc_repos
+    clone_repos "sdc"
 
     asserts_file_exist $sdc_src_folder/pom.xml
     asserts_file_exist $sdc_src_folder/sdc-os-chef/pom.xml
@@ -22,16 +22,17 @@
 
 # test_compile_all_sdc_repos() - Verifies the correct compilation of SDC repositories
 function test_compile_all_sdc_repos {
-    clone_all_sdc_repos
-    compile_all_sdc_repos
+    clone_repos "sdc"
+    compile_repos "sdc"
 
-    asserts_file_exist $sdc_src_folder/jtosca/target/jtosca-1.1.10-SNAPSHOT.jar
-    asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-ci/target/sdc-distribution-ci-1.1.*-SNAPSHOT.jar
-    asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-client/target/sdc-distribution-client-1.1.*-SNAPSHOT.jar
-    asserts_file_exist $sdc_src_folder/sdc-titan-cassandra/target/jamm-0.3.0.jar
-    asserts_file_exist $sdc_src_folder/sdc-tosca/target/sdc-tosca-1.1.*-SNAPSHOT.jar
+    #asserts_file_exist $sdc_src_folder/jtosca/target/jtosca-1.1.10-SNAPSHOT.jar
+    #asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-ci/target/sdc-distribution-ci-1.1.*-SNAPSHOT.jar
+    #asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-client/target/sdc-distribution-client-1.1.*-SNAPSHOT.jar
+    #asserts_file_exist $sdc_src_folder/sdc-titan-cassandra/target/jamm-0.3.0.jar
+    #asserts_file_exist $sdc_src_folder/sdc-tosca/target/sdc-tosca-1.1.*-SNAPSHOT.jar
 
-    for dirc in logging sdc-artifact-generator; do
+    #for dirc in logging sdc-artifact-generator; do
+    for dirc in logging; do
         name="openecomp-$dirc"
         for module in api core; do
             fullname="$name-$module"
@@ -42,7 +43,7 @@
 
 # test_get_sdc_images() - Verifies the correct retrieval of SDC Docker images
 function test_get_sdc_images {
-    clone_all_sdc_repos
+    clone_repos "sdc"
     get_sdc_images
 
     for image in sanity elasticsearch cassandra kibana frontend backend; do
@@ -52,7 +53,7 @@
 
 # test_install_sdc() - Verifies that SDC services are up and running
 function test_install_sdc {
-    clone_all_sdc_repos
+    clone_repos "sdc"
     get_sdc_images
     install_sdc
 
diff --git a/bootstrap/vagrant-onap/tests/test_sdnc b/bootstrap/vagrant-onap/tests/test_sdnc
old mode 100644
new mode 100755
index 7b54749..1a24a72
--- a/bootstrap/vagrant-onap/tests/test_sdnc
+++ b/bootstrap/vagrant-onap/tests/test_sdnc
@@ -9,21 +9,21 @@
 
 # test_clone_all_sdnc_repos() - Verify the source code retrieve of SDNC project
 function test_clone_all_sdnc_repos {
-    clone_all_sdnc_repos
+    clone_repos "sdnc"
 
     asserts_file_exist $sdnc_src_folder/adaptors/pom.xml
-    asserts_file_exist $sdnc_src_folder/architecture/docs/index.rst
+    #asserts_file_exist $sdnc_src_folder/architecture/docs/index.rst
     asserts_file_exist $sdnc_src_folder/core/pom.xml
-    asserts_file_exist $sdnc_src_folder/features/docs/index.rst
+    #asserts_file_exist $sdnc_src_folder/features/docs/index.rst
     asserts_file_exist $sdnc_src_folder/northbound/pom.xml
     asserts_file_exist $sdnc_src_folder/oam/pom.xml
-    asserts_file_exist $sdnc_src_folder/parent/docs/index.rst
+    #asserts_file_exist $sdnc_src_folder/parent/docs/index.rst
     asserts_file_exist $sdnc_src_folder/plugins/pom.xml
 }
 
 # test_compile_all_sdnc_repos() - Verify the correct compilation of SDNC projects
 function test_compile_all_sdnc_repos {
-    clone_all_sdnc_repos
+    clone_repos "sdnc"
     compile_all_sdnc_repos
 
     for component in generic-resource-api vnfapi vnftools; do
@@ -41,7 +41,7 @@
 
 # test_get_sdnc_images() - Verify that the SDNC images are created or retrieved
 function test_get_sdnc_images {
-    clone_all_sdnc_repos
+    clone_repos "sdnc"
     get_sdnc_images
 
     asserts_image onap/sdnc-image
@@ -52,7 +52,7 @@
 
 # test_install_sdnc() - Verify that the SDNC Docker containers are up and running
 function test_install_sdnc {
-    clone_all_sdnc_repos
+    clone_repos "sdnc"
     get_sdnc_images
     install_sdnc
 
diff --git a/bootstrap/vagrant-onap/tests/test_vfc b/bootstrap/vagrant-onap/tests/test_vfc
old mode 100644
new mode 100755
index 53d9c0d..a675c52
--- a/bootstrap/vagrant-onap/tests/test_vfc
+++ b/bootstrap/vagrant-onap/tests/test_vfc
@@ -9,7 +9,7 @@
 
 # test_clone_all_vfc_repos() - Verify cloning and pulling source code from repositories
 function test_clone_all_vfc_repos {
-    clone_all_vfc_repos
+    clone_repos "vfc"
 
     #asserts_file_exist $vfc_src_folder/pom.xml
     #asserts_file_exist $vfc_src_folder/gvnfm
@@ -30,7 +30,7 @@
 
 # test_compile_all_vfc_repos() - Verify that all the VFC modules are compiled properly
 function test_compile_all_vfc_repos {
-    clone_all_vfc_repos
+    clone_repos "vfc"
     compile_all_vfc_repos
 
     # TODO(electrocucaracha): Add asserts_file_exist
@@ -38,7 +38,7 @@
 
 # test_get_vfc_images() - Verify all VFC images are built correctly.
 function test_get_vfc_images {
-    clone_all_vfc_repos
+    clone_repos "vfc"
     get_vfc_images
 
     asserts_image onap/gvnfmdriver
@@ -50,7 +50,7 @@
 
 # test_install_vfc() - Verify that the VFC are up and running
 function test_install_vfc {
-    clone_all_vfc_repos
+    clone_repos "vfc"
     get_vfc_images
     install_vfc
 
diff --git a/bootstrap/vagrant-onap/tests/test_vid b/bootstrap/vagrant-onap/tests/test_vid
old mode 100644
new mode 100755
index 731d005..dc6adba
--- a/bootstrap/vagrant-onap/tests/test_vid
+++ b/bootstrap/vagrant-onap/tests/test_vid
@@ -9,7 +9,7 @@
 
 # test_clone_all_vid_repos() - Verifies that VID repositories are retrieved properly
 function test_clone_all_vid_repos {
-    clone_all_vid_repos
+    clone_repos "vid"
 
     asserts_file_exist $vid_src_folder/pom.xml
     asserts_file_exist $vid_src_folder/asdcclient/pom.xml
@@ -17,8 +17,8 @@
 
 # test_compile_all_vid_repos() - Verifies that VID source code is compiled properly
 function test_compile_all_vid_repos {
-    clone_all_vid_repos
-    compile_all_vid_repos
+    clone_repos "vid"
+    compile_repos "vid"
 
     asserts_file_exist $vid_src_folder/asdcclient/target/asdcclient-1.0.2-SNAPSHOT.jar
     asserts_file_exist $vid_src_folder/epsdk-app-onap/target/vid.war
@@ -27,7 +27,7 @@
 
 # test_get_vid_images() - Verifies that VID Docker images are built properly
 function test_get_vid_images {
-    clone_all_vid_repos
+    clone_repos "vid"
     get_vid_images
 
     asserts_image openecomp/vid
@@ -36,7 +36,7 @@
 
 # test_install_vid() - Verifies taht VID services are up and running
 function test_install_vid {
-    clone_all_vid_repos
+    clone_repos "vid"
     get_vid_images
     install_vid
 
diff --git a/bootstrap/vagrant-onap/tests/test_vnfsdk b/bootstrap/vagrant-onap/tests/test_vnfsdk
old mode 100644
new mode 100755
index 250a9fc..6f37904
--- a/bootstrap/vagrant-onap/tests/test_vnfsdk
+++ b/bootstrap/vagrant-onap/tests/test_vnfsdk
@@ -9,7 +9,7 @@
 
 # test_clone_all_vnfsdk_repos() - Verify the cloning of VNFSDK source repo.
 function test_clone_all_vnfsdk_repos {
-    clone_all_vnfsdk_repos
+    clone_repos "vnfsdk"
 
     asserts_file_exist $vnfsdk_src_folder/compliance/veslibrary/README
     asserts_file_exist $vnfsdk_src_folder/functest/pom.xml
@@ -22,8 +22,8 @@
 
 # test_compile_all_vnfsdk_repos () - Verify if VNFSDK source repo compiles correctly.
 function test_compile_all_vnfsdk_repos {
-    clone_all_vnfsdk_repos
-    compile_all_vnfsdk_repos
+    clone_repos "vnfsdk"
+    compile_repos "vnfsdk"
 
     asserts_file_exist $vnfsdk_src_folder/lctest/lifecycle-test/target/lifecycle-test-service-1.0.0-SNAPSHOT.war
     asserts_file_exist $vnfsdk_src_folder/pkgtools/target/vnf-sdk-pkgtools-1.0.0-SNAPSHOT.zip
@@ -33,7 +33,7 @@
 
 # test_get_vnfsdk_images() - Verify that the VNFSDK images are created or retrieved
 function test_get_vnfsdk_images {
-    clone_all_vnfsdk_repos
+    clone_repos "vnfsdk"
     get_vnfsdk_images
 
     asserts_image refrepo:1.0-STAGING-latest
@@ -42,7 +42,7 @@
 
 # test_install_vnfsdk() - Verify that VNFSDK docker images are running.
 function test_install_vnfsdk {
-    clone_all_vnfsdk_repos
+    clone_repos "vnfsdk"
     get_vnfsdk_images
     install_vnfsdk
 
diff --git a/bootstrap/vagrant-onap/tests/test_vvp b/bootstrap/vagrant-onap/tests/test_vvp
old mode 100644
new mode 100755
index f77fdf4..4762e1d
--- a/bootstrap/vagrant-onap/tests/test_vvp
+++ b/bootstrap/vagrant-onap/tests/test_vvp
@@ -9,7 +9,7 @@
 
 # test_clone_all_vvp_repos() - Verify the cloning of VNFSDK source repo.
 function test_clone_all_vvp_repos {
-    clone_all_vvp_repos
+    clone_repos "vvp"
 
     asserts_file_exist $vvp_src_folder/cms/pom.xml
     asserts_file_exist $vvp_src_folder/devkit/LICENSE.TXT
@@ -25,15 +25,15 @@
 
 # test_compile_all_vvp_repos () - Verify if VNFSDK source repo compiles correctly.
 function test_compile_all_vvp_repos {
-    clone_all_vvp_repos
-    compile_all_vvp_repos
+    clone_repos "vvp"
+    compile_repos "vvp"
 
    # asserts_file_exist $vvp_src_folder/
 }
 
 # test_get_vvp_images() - Verify that the VNFSDK images are created or retrieved
 function test_get_vvp_images {
-    clone_all_vvp_repos
+    clone_repos "vvp"
     get_vvp_images
 
     #asserts_image refrepo:latest
@@ -41,7 +41,7 @@
 
 # test_install_vvp() - Verify that VNFSDK docker images are running.
 function test_install_vvp {
-    clone_all_vvp_repos
+    clone_repos "vvp"
     get_vvp_images
     install_vvp