diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index cd2aee5490f33d315901edd3646a7c70873bd2ad..babc465d67ff899d6c718b8aa45b0d7de8ec8961 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -17,10 +17,22 @@ if [ -d ./unwanted_logs/ ]; then
   rm -rdf ./unwanted_logs
 fi
 
-# We want our tests to always use valgrind 
-#echo -e "\nStarting simple tests ...\n"
-#for FILENAME in "$TEST_FILES_DIR"/*
-#do 
+simple_test_files=(
+  'tests_files/greeting.txt'
+  'tests_files/long_message.txt'
+  'tests_files/smile.png'
+  'tests_files/thumbs-up-nod.gif'
+)
+
+advanced_test_files=(
+  'tests_files/greeting.txt'
+  'tests_files/long_message.txt'
+  'tests_files/noice.gif'
+)
+
+# echo -e "\nStarting simple tests ...\n"
+# for FILENAME in "${simple_test_files[@]}"
+# do 
 #  FILESIZE=$(stat -c%s "$FILENAME")
 #  echo -e "${BROWN}Sending \"$FILENAME\"  \t[$FILESIZE bytes] with Valgrind${NC}"
 #  ./tests/simple_test.sh $FILENAME
@@ -30,13 +42,13 @@ fi
 #    exit 0
 #  fi
 
-#done
-#echo -e "Finished Simple tests."
+# done
+# echo -e "Finished Simple tests."
 
 if [ -d linksimulator/ ]; then
   echo -e "\nStarting advanced tests ...\n"
   # Now we ran the advanced tests
-  for FILENAME in "$TEST_FILES_DIR"/*
+  for FILENAME in "${advanced_test_files[@]}"
   do 
     FILESIZE=$(stat -c%s "$FILENAME")
     echo -e "\n${BROWN}Sending the file \"$FILENAME\"  \t[$FILESIZE bytes] with linksimulator and Valgrind${NC}"
diff --git a/tests_files/long_message.txt b/tests_files/long_message.txt
index 9a4178c362cdafd845cf5179691e0f1c6dccca0e..a18b03ec08fdc53c1f0a5e0fc9187b5a0f18568f 100644
--- a/tests_files/long_message.txt
+++ b/tests_files/long_message.txt
@@ -6,14 +6,14 @@ ahead. So good luck have a nice day of testing and remember : Tough Times Never
 PS: Drink a beer when you pass the test. Share your knowledge to others, computer 
 science isn't a field for selfishness. If you want to switch to Law, Economy, some shit
 
-Hi Vany I love reading from you. As you know I'm working sometime a bit late in the night.
-In a few hour you'll be in the famous "Salle Intel" to be really productive as you are.
+Hi Vany I'm pleased to read some news from you. As you know I work sometime a bit late in the night.
+In a few hour you'll show up in the famous "Salle Intel" to be really productive as you are.
 
 Best regards,
 
 Samuel
 
-Sorry to be lazy but I'll past down what is above
+Sorry to be lazy but I'll past down what is above :')
 
 Hello I'm a good friend, I've seen that you are writing a protocol named TRTP. 
 How is it going ? Hard ? Good for you. See life is full of hard things just like your 
@@ -23,9 +23,7 @@ ahead. So good luck have a nice day of testing and remember : Tough Times Never
 PS: Drink a beer when you pass the test. Share your knowledge to others, computer 
 science isn't a field for selfishness. If you want to switch to Law, Economy, some shit
 
-Hi Vany I love reading from you. As you know I'm working sometime a bit late in the night.
-In a few hour you'll be in the famous "Salle Intel" to be really productive as you are.
+Hi Vany I'm pleased to read some news from you. As you know I work sometime a bit late in the night.
+In a few hour you'll show up in the famous "Salle Intel" to be really productive as you are.
 
 Best regards,
-
-Samuel