diff --git a/translator/toscalib/tests/artifacts/collectd/create.sh b/translator/toscalib/tests/artifacts/collectd/create.sh
index 323d486..4d3f9a3 100755
--- a/translator/toscalib/tests/artifacts/collectd/create.sh
+++ b/translator/toscalib/tests/artifacts/collectd/create.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 # This script install collectd for monitoring data
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do
diff --git a/translator/toscalib/tests/artifacts/elasticsearch/create.sh b/translator/toscalib/tests/artifacts/elasticsearch/create.sh
index 03183e0..844f4a8 100755
--- a/translator/toscalib/tests/artifacts/elasticsearch/create.sh
+++ b/translator/toscalib/tests/artifacts/elasticsearch/create.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 # This script installs java and elasticsearch
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do
diff --git a/translator/toscalib/tests/artifacts/logstash/create.sh b/translator/toscalib/tests/artifacts/logstash/create.sh
index a0b3af2..fe6883f 100755
--- a/translator/toscalib/tests/artifacts/logstash/create.sh
+++ b/translator/toscalib/tests/artifacts/logstash/create.sh
@@ -2,6 +2,10 @@
 # This script installs java, logstash and the contrib package for logstash
 # install java as prereq
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do
diff --git a/translator/toscalib/tests/artifacts/mongodb/create.sh b/translator/toscalib/tests/artifacts/mongodb/create.sh
index d21ff01..e1f67aa 100644
--- a/translator/toscalib/tests/artifacts/mongodb/create.sh
+++ b/translator/toscalib/tests/artifacts/mongodb/create.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 # This script installs mongodb
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
 echo "deb http://repo.mongodb.org/apt/ubuntu "$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.0.list
 
diff --git a/translator/toscalib/tests/artifacts/mysql/mysql_dbms_install.sh b/translator/toscalib/tests/artifacts/mysql/mysql_dbms_install.sh
index 73f6386..6d8a351 100755
--- a/translator/toscalib/tests/artifacts/mysql/mysql_dbms_install.sh
+++ b/translator/toscalib/tests/artifacts/mysql/mysql_dbms_install.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 #This script installs mysql server
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do
diff --git a/translator/toscalib/tests/artifacts/nodejs/create.sh b/translator/toscalib/tests/artifacts/nodejs/create.sh
index 1690447..c9a7589 100644
--- a/translator/toscalib/tests/artifacts/nodejs/create.sh
+++ b/translator/toscalib/tests/artifacts/nodejs/create.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 # This script installs nodejs and the prereq
+
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 add-apt-repository ppa:chris-lea/node.js
 
 #Trying to avoid multiple apt-get's running simultaneously (in the
diff --git a/translator/toscalib/tests/artifacts/rsyslog/create.sh b/translator/toscalib/tests/artifacts/rsyslog/create.sh
index 59f4e2a..dcd3d8a 100755
--- a/translator/toscalib/tests/artifacts/rsyslog/create.sh
+++ b/translator/toscalib/tests/artifacts/rsyslog/create.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 # This script installs rsyslog and the library for RELP
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do
diff --git a/translator/toscalib/tests/artifacts/webserver/webserver_install.sh b/translator/toscalib/tests/artifacts/webserver/webserver_install.sh
index e165048..e191e8e 100755
--- a/translator/toscalib/tests/artifacts/webserver/webserver_install.sh
+++ b/translator/toscalib/tests/artifacts/webserver/webserver_install.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 #This script installs apache web server
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do
diff --git a/translator/toscalib/tests/artifacts/wordpress/wordpress_install.sh b/translator/toscalib/tests/artifacts/wordpress/wordpress_install.sh
index bfd3423..cdb3e6a 100755
--- a/translator/toscalib/tests/artifacts/wordpress/wordpress_install.sh
+++ b/translator/toscalib/tests/artifacts/wordpress/wordpress_install.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 #This script installs wordpress
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh
index 323d486..4d3f9a3 100755
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/collectd/create.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 # This script install collectd for monitoring data
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh
index 03183e0..844f4a8 100755
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/elasticsearch/create.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 # This script installs java and elasticsearch
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh
index a0b3af2..fe6883f 100755
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/logstash/create.sh
@@ -2,6 +2,10 @@
 # This script installs java, logstash and the contrib package for logstash
 # install java as prereq
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh
index d21ff01..e1f67aa 100644
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/mongodb/create.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 # This script installs mongodb
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
 echo "deb http://repo.mongodb.org/apt/ubuntu "$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.0.list
 
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh
index 1690447..c9a7589 100644
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/nodejs/create.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 # This script installs nodejs and the prereq
+
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 add-apt-repository ppa:chris-lea/node.js
 
 #Trying to avoid multiple apt-get's running simultaneously (in the
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh
index 59f4e2a..dcd3d8a 100755
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Scripts/rsyslog/create.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 # This script installs rsyslog and the library for RELP
 
+#The while loops in the script, which are added as a workaround to
+#make sure multiple apt-get's do not run simultaneously, can be removed
+#safely if an orchestrator executing this script is handling the situation.
+
 #Trying to avoid multiple apt-get's running simultaneously (in the
 #rare occasion that the apt-get command fails rerun the script).
 while [[ "$(ps -A | grep apt-get | awk '{print $1}')" != "" ]]; do