diff --git a/bootstrap/vagrant-onap/lib/aai b/bootstrap/vagrant-onap/lib/aai
index bd72ae0..4da5763 100755
--- a/bootstrap/vagrant-onap/lib/aai
+++ b/bootstrap/vagrant-onap/lib/aai
@@ -6,7 +6,10 @@
 
 hbase_version=1.2.3
 aai_src_folder=$git_src_folder/aai
-aai_repos=("aai-common" "aai-config" "aai-data" "aai-service" "data-router" "logging-service" "model-loader" "resources" "rest-client" "router-core" "search-data-service" "test-config" "traversal" "sparky-fe" "sparky-be")
+aai_repos=("aai-common" "aai-config" "aai-data" "aai-service" "babel" "champ" \
+"data-router" "esr-gui" "esr-server" "gizmo" "logging-service" "model-loader" \
+"resources" "rest-client" "router-core" "search-data-service" "test-config" \
+"traversal" "sparky-fe" "sparky-be")
 
 # install_hadoop() - Function that installs Hadoop
 function install_hadoop {
diff --git a/bootstrap/vagrant-onap/tests/test_aai b/bootstrap/vagrant-onap/tests/test_aai
index 5ff62c1..79d26c8 100644
--- a/bootstrap/vagrant-onap/tests/test_aai
+++ b/bootstrap/vagrant-onap/tests/test_aai
@@ -39,7 +39,12 @@
     asserts_file_exist $aai_src_folder/aai-config/cookbooks/aai-resources/runlist-aai-resources.json
     asserts_file_exist $aai_src_folder/aai-data/environments/solo.json
     asserts_file_exist $aai_src_folder/aai-service/pom.xml
+    asserts_file_exist $aai_src_folder/babel/README.md
+    asserts_file_exist $aai_src_folder/champ/pom.xml
     asserts_file_exist $aai_src_folder/data-router/pom.xml
+    asserts_file_exist $aai_src_folder/esr-gui/pom.xml
+    asserts_file_exist $aai_src_folder/esr-server/pom.xml
+    asserts_file_exist $aai_src_folder/gizmo/pom.xml
     asserts_file_exist $aai_src_folder/logging-service/pom.xml
     asserts_file_exist $aai_src_folder/model-loader/pom.xml
     asserts_file_exist $aai_src_folder/resources/pom.xml
@@ -57,14 +62,13 @@
     clone_all_aai_repos
     compile_aai_repos
 
-    asserts_file_exist $aai_src_folder/aai-common/aai-annotations/target/aai-annotations-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $aai_src_folder/aai-common/aai-auth/target/aai-auth-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $aai_src_folder/aai-common/aai-core/target/aai-core-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $aai_src_folder/aai-common/aai-schema/target/aai-schema-1.1.0-SNAPSHOT.jar
+    for common in annotations auth core schema utils; do
+        asserts_file_exist $aai_src_folder/aai-common/aai-$common/target/aai-$common-1.1.0-SNAPSHOT.jar
+    done
 
-    asserts_file_exist $aai_src_folder/logging-service/common-logging/target/common-logging-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $aai_src_folder/logging-service/eelf-logging/target/eelf-logging-1.1.0-SNAPSHOT.jar
-    asserts_file_exist $aai_src_folder/logging-service/logging-api/target/logging-api-1.1.0-SNAPSHOT.jar
+    for service in common-logging eelf-logging logging-api; do
+        asserts_file_exist $aai_src_folder/logging-service/$service/target/$service-1.1.0-SNAPSHOT.jar
+    done
 
     asserts_file_exist $aai_src_folder/resources/aai-resources/target/aai-resources.jar
     asserts_file_exist $aai_src_folder/traversal/aai-traversal/target/traversal.jar