diff --git a/performance_results/ideal/merged_stats.csv b/performance_results/ideal/merged_stats.csv
deleted file mode 100644
index 369aab13dff0643ebde87f7623b1a207e78f5b25..0000000000000000000000000000000000000000
--- a/performance_results/ideal/merged_stats.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-data_sent,data_received,data_truncated_received,fec_sent,fec_received,ack_sent,ack_received,nack_received,packet_ignored,throughput,min_rtt,max_rtt,packet_retransmitted,fec
-43263.0,0.0,0.0,0.0,0.0,0.0,38716.0,30.0,0.0,996184.9375,7.0,222.0,38737.0,0
-43386.0,0.0,0.0,1132.0,0.0,0.0,38845.0,24.0,0.0,1002924.3125,4.0,294.0,38860.0,1
-44906.0,0.0,0.0,1132.0,0.0,0.0,40370.0,17.0,0.0,1033694.0,4.0,218.0,40380.0,1
-34710.0,0.0,0.0,0.0,0.0,0.0,30175.0,19.0,0.0,925487.25,6.0,545.0,30184.0,0
-36801.0,0.0,0.0,0.0,0.0,0.0,32265.0,19.0,0.0,968436.4375,4.0,300.0,32275.0,0
-30674.0,0.0,0.0,1132.0,0.0,0.0,26133.0,25.0,0.0,948363.9375,5.0,249.0,26148.0,1
diff --git a/performance_results/ideal/output.gif b/performance_results/ideal/output.gif
deleted file mode 100644
index ae8a968b45b58c62a535e62648696f90a97b37d3..0000000000000000000000000000000000000000
Binary files a/performance_results/ideal/output.gif and /dev/null differ
diff --git a/performance_results/ideal/receiver_1_with_FEC.csv b/performance_results/ideal/receiver_1_with_FEC.csv
deleted file mode 100644
index 6177c35a89de1a4159be0316a16ee8ff9a3e0828..0000000000000000000000000000000000000000
--- a/performance_results/ideal/receiver_1_with_FEC.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-data_sent:0
-data_received:5859
-data_truncated_received:19
-fec_sent:0
-fec_received:724
-ack_sent:39291
-ack_received:0
-nack_received:0
-packet_ignored:453
-throughput:1044119.437500
-packet_duplicated:1457
-packet_recovered:124
diff --git a/performance_results/ideal/receiver_1_without_FEC.csv b/performance_results/ideal/receiver_1_without_FEC.csv
deleted file mode 100644
index de8471fab8a1a875c241d9694f7d3f153ede6b7a..0000000000000000000000000000000000000000
--- a/performance_results/ideal/receiver_1_without_FEC.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-data_sent:0
-data_received:5904
-data_truncated_received:23
-fec_sent:0
-fec_received:0
-ack_sent:39165
-ack_received:0
-nack_received:0
-packet_ignored:392
-throughput:1001298.562500
-packet_duplicated:1378
-packet_recovered:0
diff --git a/performance_results/ideal/receiver_2_with_FEC.csv b/performance_results/ideal/receiver_2_with_FEC.csv
deleted file mode 100644
index 0787b14cbd88158b2e6a67802cfb72a6595b2b95..0000000000000000000000000000000000000000
--- a/performance_results/ideal/receiver_2_with_FEC.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-data_sent:0
-data_received:5853
-data_truncated_received:19
-fec_sent:0
-fec_received:721
-ack_sent:40197
-ack_received:0
-nack_received:0
-packet_ignored:467
-throughput:1029673.375000
-packet_duplicated:1450
-packet_recovered:123
diff --git a/performance_results/ideal/receiver_2_without_FEC.csv b/performance_results/ideal/receiver_2_without_FEC.csv
deleted file mode 100644
index c40a93eab833a87b56381be50973644aba18e783..0000000000000000000000000000000000000000
--- a/performance_results/ideal/receiver_2_without_FEC.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-data_sent:0
-data_received:5877
-data_truncated_received:27
-fec_sent:0
-fec_received:0
-ack_sent:37830
-ack_received:0
-nack_received:0
-packet_ignored:383
-throughput:993940.812500
-packet_duplicated:1351
-packet_recovered:0
diff --git a/performance_results/ideal/receiver_3_with_FEC.csv b/performance_results/ideal/receiver_3_with_FEC.csv
deleted file mode 100644
index 108a0757ff3d62f915eb7449032a296965682cef..0000000000000000000000000000000000000000
--- a/performance_results/ideal/receiver_3_with_FEC.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-data_sent:0
-data_received:5449
-data_truncated_received:18
-fec_sent:0
-fec_received:763
-ack_sent:27451
-ack_received:0
-nack_received:0
-packet_ignored:352
-throughput:971431.750000
-packet_duplicated:1072
-packet_recovered:149
diff --git a/performance_results/ideal/receiver_3_without_FEC.csv b/performance_results/ideal/receiver_3_without_FEC.csv
deleted file mode 100644
index 22ca3b148e307d92c3920fe33d8aea21fbeaca08..0000000000000000000000000000000000000000
--- a/performance_results/ideal/receiver_3_without_FEC.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-data_sent:0
-data_received:5835
-data_truncated_received:27
-fec_sent:0
-fec_received:0
-ack_sent:38436
-ack_received:0
-nack_received:0
-packet_ignored:422
-throughput:992450.312500
-packet_duplicated:1309
-packet_recovered:0
diff --git a/performance_results/ideal/sender_1_with_FEC.csv b/performance_results/ideal/sender_1_with_FEC.csv
deleted file mode 100644
index d13c7407ddee13e74689be91d9a7dadb30cd6a04..0000000000000000000000000000000000000000
--- a/performance_results/ideal/sender_1_with_FEC.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-data_sent:43811
-data_received:0
-data_truncated_received:0
-fec_sent:1132
-fec_received:0
-ack_sent:0
-ack_received:39275
-nack_received:19
-packet_ignored:0
-throughput:1039259.312500
-min_rtt:4
-max_rtt:240
-packet_retransmitted:39285
diff --git a/performance_results/ideal/sender_1_without_FEC.csv b/performance_results/ideal/sender_1_without_FEC.csv
deleted file mode 100644
index f5cb9a721ce8edda9d1be664064bab690ee8d9bb..0000000000000000000000000000000000000000
--- a/performance_results/ideal/sender_1_without_FEC.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-data_sent:43706
-data_received:0
-data_truncated_received:0
-fec_sent:0
-fec_received:0
-ack_sent:0
-ack_received:39165
-nack_received:23
-packet_ignored:0
-throughput:997203.437500
-min_rtt:5
-max_rtt:230
-packet_retransmitted:39180
diff --git a/performance_results/ideal/sender_2_with_FEC.csv b/performance_results/ideal/sender_2_with_FEC.csv
deleted file mode 100644
index aef860215a8d0267f082557c9888d928e107dfe1..0000000000000000000000000000000000000000
--- a/performance_results/ideal/sender_2_with_FEC.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-data_sent:44734
-data_received:0
-data_truncated_received:0
-fec_sent:1132
-fec_received:0
-ack_sent:0
-ack_received:40197
-nack_received:19
-packet_ignored:0
-throughput:1022288.937500
-min_rtt:2
-max_rtt:227
-packet_retransmitted:40208
diff --git a/performance_results/ideal/sender_2_without_FEC.csv b/performance_results/ideal/sender_2_without_FEC.csv
deleted file mode 100644
index 6b2f8d3f29c5071792cf015b71c2fd69e546d1c4..0000000000000000000000000000000000000000
--- a/performance_results/ideal/sender_2_without_FEC.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-data_sent:42374
-data_received:0
-data_truncated_received:0
-fec_sent:0
-fec_received:0
-ack_sent:0
-ack_received:37829
-nack_received:27
-packet_ignored:0
-throughput:984541.062500
-min_rtt:4
-max_rtt:238
-packet_retransmitted:37848
diff --git a/performance_results/ideal/sender_3_with_FEC.csv b/performance_results/ideal/sender_3_with_FEC.csv
deleted file mode 100644
index e76ed44be6c77c075d1c301d0e06b1dfa307582d..0000000000000000000000000000000000000000
--- a/performance_results/ideal/sender_3_with_FEC.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-data_sent:31985
-data_received:0
-data_truncated_received:0
-fec_sent:1132
-fec_received:0
-ack_sent:0
-ack_received:27451
-nack_received:18
-packet_ignored:0
-throughput:963552.000000
-min_rtt:1
-max_rtt:300
-packet_retransmitted:27459
diff --git a/performance_results/ideal/sender_3_without_FEC.csv b/performance_results/ideal/sender_3_without_FEC.csv
deleted file mode 100644
index c8e0b2410ddde808b85103b03e1261a64f72f2b4..0000000000000000000000000000000000000000
--- a/performance_results/ideal/sender_3_without_FEC.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-data_sent:42970
-data_received:0
-data_truncated_received:0
-fec_sent:0
-fec_received:0
-ack_sent:0
-ack_received:38427
-nack_received:27
-packet_ignored:0
-throughput:990699.375000
-min_rtt:6
-max_rtt:251
-packet_retransmitted:38444
diff --git a/src/receiver_utils.c b/src/receiver_utils.c
index f970bc3ea691d2b3e8be90857e80304301fa4d3e..199338601c06604edeb6141bef212100687ffef5 100644
--- a/src/receiver_utils.c
+++ b/src/receiver_utils.c
@@ -663,7 +663,6 @@ void receiver_read_write_loop(int sfd, const char * pathname)
         reception_loop(pfd, state);
     }
     DEBUG("Done the transfer with done status being %s", (state->transfer_done) ? "true" : "false");
-    sleep(2);
     double time_in_ms = time_milliseconds(&(state->timestamp_last_packet)) - time_milliseconds(&(state->timestamp_first_packet));
     DEBUG("The difference between the two is %f seconds", (double) time_in_ms * 1000);
     DEBUG("The transfer took %f seconds", time_in_ms);
diff --git a/tests/run_perfomance.sh b/tests/run_perfomance.sh
index 491a8667093a4e698b42ba57d8791b8e618510a3..e05fbbce6c9b40a4783b8236af7cf6441447d22a 100755
--- a/tests/run_perfomance.sh
+++ b/tests/run_perfomance.sh
@@ -3,19 +3,50 @@
 # File use for the test of performance
 FILE_TO_TRANSFER='tests_files/thumbs-up-nod.gif'
 
-### 1. Ideal Case Transferr
+if [ ! -d "performance_results/" ]; then
+  mkdir "performance_results/"
+fi
+
+### 1. Ideal Case Transfer
 
 # Chosen parameters for Ideal scenario
 ERROR_RATE=1
+CUT_RATE=0
+DELAY=3
+JITTER=1
+LOSS_RATE=0 
+
+
+if [ ! -d "performance_results/ideal" ]; then
+  mkdir "performance_results/ideal"
+fi
+export ERROR_RATE CUT_RATE DELAY JITTER LOSS_RATE && ./tests/perfomance_test.sh ${FILE_TO_TRANSFER} "performance_results/ideal/"
+
+
+### 2. Average Case Transfer
+
+# Chosen parameters for Ideal scenario
+ERROR_RATE=10
 CUT_RATE=1
-DELAY=100
-JITTER=100
+DELAY=290
+JITTER=30
 LOSS_RATE=1 
-if [ ! -d "performance_results/" ]; then
-  mkdir "performance_results/"
+
+if [ ! -d "performance_results/average" ]; then
+  mkdir "performance_results/average"
 fi
+export ERROR_RATE CUT_RATE DELAY JITTER LOSS_RATE && ./tests/perfomance_test.sh ${FILE_TO_TRANSFER} "performance_results/average/"
 
-if [ ! -d "performance_results/ideal" ]; then
-  mkdir "performance_results/ideal"
+### 2. Average Case Transfer
+
+# Chosen parameters for Ideal scenario
+ERROR_RATE=10
+CUT_RATE=1
+DELAY=1500
+JITTER=500
+LOSS_RATE=1
+
+if [ ! -d "performance_results/worst" ]; then
+  mkdir "performance_results/worst"
 fi
-export ERROR_RATE CUT_RATE DELAY JITTER LOSS_RATE && ./tests/perfomance_test.sh ${FILE_TO_TRANSFER} "performance_results/ideal/"
\ No newline at end of file
+export ERROR_RATE CUT_RATE DELAY JITTER LOSS_RATE && ./tests/perfomance_test.sh ${FILE_TO_TRANSFER} "performance_results/worst/"
\ No newline at end of file
diff --git a/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_link.log b/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_link.log
index d3af715735a6c2933b33eada6e2a31cab166363d..1f6ec7cb7b2d60382864f5669fd0c9ed6489c5d8 100644
--- a/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_link.log
+++ b/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_link.log
@@ -1,22 +1,14 @@
-@@ Using random seed: 1650983295
+@@ Using random seed: 1650987716
 @@ Using parameters:
-.. port: 65086
-.. forward_port: 65117
+.. port: 65169
+.. forward_port: 65135
 .. delay: 100
 .. jitter: 100
 .. err_rate: 1
 .. cut_rate: 1
 .. loss_rate: 1
-.. seed: 1650983295
+.. seed: 1650987716
 .. link_direction: Forward
-@@ Remote host is ::1 [54141]
-[SEQ   0] Delayed packet by 109 ms
+@@ Remote host is ::1 [59206]
+[SEQ   0] Delayed packet by 143 ms
 [SEQ   0] Sent packet (Forward).
-[SEQ   0] Delayed packet by 9 ms
-[SEQ   0] Sent packet (Forward).
-[SEQ   1] Sent packet (Reverse).
-[SEQ   1] Delayed packet by 7 ms
-[FEC   0] Delayed packet by 162 ms
-[SEQ   1] Sent packet (Forward).
-[FEC   0] Sent packet (Forward).
-[SEQ   2] Sent packet (Reverse).
diff --git a/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_received_file.txt b/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_received_file.txt
index c57eff55ebc0c54973903af5f72bac72762cf4f4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_received_file.txt
+++ b/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_received_file.txt
@@ -1 +0,0 @@
-Hello World!
\ No newline at end of file
diff --git a/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_receiver.log b/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_receiver.log
index 7a5fc8b8f18d99d9bbc9d8727d1ccc1323a3fd16..7b72f22bd6650637abab42bf58aecdc98be8f8f3 100644
--- a/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_receiver.log
+++ b/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_receiver.log
@@ -1,17 +1,4 @@
-[DEBUG] Receiver has following arguments: stats_filename is tests_logs/advanced_tests/greeting/with_FEC/greeting_receiver_stats.csv, listen_ip is ::1, listen_port is 65117
-[DEBUG] Successfully bound to IPv6 address : 0000:0000:0000:0000:0000:0000:0000:0001, port : 65117
-[DEBUG] Successfully connected to IPv6 addresss: 0000:0000:0000:0000:0000:0000:0000:0001, port : 65086
+[DEBUG] Receiver has following arguments: stats_filename is tests_logs/advanced_tests/greeting/with_FEC/greeting_receiver_stats.csv, listen_ip is ::1, listen_port is 65135
+[DEBUG] Successfully bound to IPv6 address : 0000:0000:0000:0000:0000:0000:0000:0001, port : 65135
+[DEBUG] Successfully connected to IPv6 addresss: 0000:0000:0000:0000:0000:0000:0000:0001, port : 65169
 [DEBUG] Received data packet seqnum 0 with timestamp 984824098 | current_window_size : 31, current_window_start : 0
-[DEBUG] Received data packet seqnum 0 with timestamp 984824098 | current_window_size : 30, current_window_start : 0
-[DEBUG] Sent ACK saying we are waiting for 1, timestamp 0
-[DEBUG] Received data packet seqnum 1 with timestamp 0 | current_window_size : 30, current_window_start : 0
-[DEBUG] Going to consume the next 2 packets.
-[DEBUG] Consuming packet : 0 | curr_recv_window = 29, recv_window_start = 0
-[DEBUG] Consuming packet : 1 | curr_recv_window = 30, recv_window_start = 1
-[DEBUG] Received the last packet
-[DEBUG] Received packet [0] Out of window with timestamp 0 | receive window start at : 2 (included) till 33 (excluded)
-[DEBUG] Sent ACK saying we are waiting for 2, timestamp 0
-[DEBUG] Done the transfer with done status being true
-[DEBUG] The difference between the two is 2014000.000000 seconds
-[DEBUG] The transfer took 2014.000000 seconds
-[DEBUG] Wrote the transfer statistics to tests_logs/advanced_tests/greeting/with_FEC/greeting_receiver_stats.csv.
diff --git a/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_sender.log b/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_sender.log
index b52647b5e5dec7112951ea1e898d90877ffd0bdf..27fb2b63087f3aa8cc2bbb84fa47c290a5424cae 100644
--- a/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_sender.log
+++ b/tests_logs/advanced_tests/greeting/with_FEC/adv_greeting_sender.log
@@ -3,25 +3,8 @@
 		stats_filename is tests_logs/advanced_tests/greeting/with_FEC/greeting_sender_stats.csv,
 		fec_enabled is 1,
 		receiver_ip is ::1,
-		receiver_port is 65086
-[DEBUG] Successfully connected to IPv6 addresss: 0000:0000:0000:0000:0000:0000:0000:0001, port : 65086
+		receiver_port is 65169
+[DEBUG] Successfully connected to IPv6 addresss: 0000:0000:0000:0000:0000:0000:0000:0001, port : 65169
 [DEBUG] The sender will send a pkt on the socket, the current sender window size is: 31 | receiver window size: 1
 [DEBUG] The LAST PTYPE_DATA is being sent !
 [DEBUG] Sending the pkt with seqnum: 0
-[DEBUG] The pkt with seqnum: 0 has timeout
-[DEBUG] Sending the pkt with seqnum: 0
-[DEBUG] The sender is reading from the socket.
-[DEBUG] The ACK with the seqnum: 1 has been received
-[DEBUG] The sender is cumulatively acknowledging [0 : 1[ (place in the buffer) | [0, 1[ (seqnum)
-[DEBUG] The sender will send a pkt on the socket, the current sender window size is: 31 | receiver window size: 30
-[DEBUG] The CLOSING pkt is being sent !
-[DEBUG] Sending the pkt with seqnum: 1
-[DEBUG] A timer of -> 30000ms <- has started after sending the last PTYPE_DATA pkt !
-[DEBUG] The sender will send a pkt on the socket, the current sender window size is: 30 | receiver window size: 29
-[DEBUG] Sending LAST FEC pkt with seqnum: 0
-[DEBUG] A timer of -> 30000ms <- has started after sending the last PTYPE_DATA pkt !
-[DEBUG] The sender is reading from the socket.
-[DEBUG] The ACK with the seqnum: 2 has been received
-[DEBUG] The sender is cumulatively acknowledging [1 : 2[ (place in the buffer) | [1, 2[ (seqnum)
-[DEBUG] Sender disconnected
-[DEBUG] Wrote the transfer statistics to tests_logs/advanced_tests/greeting/with_FEC/greeting_sender_stats.csv.
diff --git a/tests_logs/advanced_tests/greeting/with_FEC/adv_valgrind_greeting_receiver.log b/tests_logs/advanced_tests/greeting/with_FEC/adv_valgrind_greeting_receiver.log
index 7738d7cdede8b88a55c83c7e17ee7adbb2c3ec9a..d3be1f2b1e3cf838dadbde53ba45afd1afae7502 100644
--- a/tests_logs/advanced_tests/greeting/with_FEC/adv_valgrind_greeting_receiver.log
+++ b/tests_logs/advanced_tests/greeting/with_FEC/adv_valgrind_greeting_receiver.log
@@ -1,15 +1,6 @@
-==31031== Memcheck, a memory error detector
-==31031== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==31031== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==31031== Command: ./receiver ::1 65117 -s tests_logs/advanced_tests/greeting/with_FEC/greeting_receiver_stats.csv
-==31031== Parent PID: 30999
-==31031== 
-==31031== 
-==31031== HEAP SUMMARY:
-==31031==     in use at exit: 0 bytes in 0 blocks
-==31031==   total heap usage: 15 allocs, 15 frees, 10,928 bytes allocated
-==31031== 
-==31031== All heap blocks were freed -- no leaks are possible
-==31031== 
-==31031== For lists of detected and suppressed errors, rerun with: -s
-==31031== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+==36399== Memcheck, a memory error detector
+==36399== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
+==36399== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
+==36399== Command: ./receiver ::1 65135 -s tests_logs/advanced_tests/greeting/with_FEC/greeting_receiver_stats.csv
+==36399== Parent PID: 36367
+==36399== 
diff --git a/tests_logs/advanced_tests/greeting/with_FEC/adv_valgrind_greeting_sender.log b/tests_logs/advanced_tests/greeting/with_FEC/adv_valgrind_greeting_sender.log
index 97b905e95a0dbbb9b0218c77f199ea6b6f7d6ecf..ff6429b7b183d6cadb3ebe4dcb96a63ad1fc4f86 100644
--- a/tests_logs/advanced_tests/greeting/with_FEC/adv_valgrind_greeting_sender.log
+++ b/tests_logs/advanced_tests/greeting/with_FEC/adv_valgrind_greeting_sender.log
@@ -1,15 +1,33 @@
-==31032== Memcheck, a memory error detector
-==31032== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==31032== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==31032== Command: ./sender -f tests_files/greeting.txt ::1 65086 -c -s tests_logs/advanced_tests/greeting/with_FEC/greeting_sender_stats.csv
-==31032== Parent PID: 30999
-==31032== 
-==31032== 
-==31032== HEAP SUMMARY:
-==31032==     in use at exit: 0 bytes in 0 blocks
-==31032==   total heap usage: 10 allocs, 10 frees, 4,420 bytes allocated
-==31032== 
-==31032== All heap blocks were freed -- no leaks are possible
-==31032== 
-==31032== For lists of detected and suppressed errors, rerun with: -s
-==31032== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+==36400== Memcheck, a memory error detector
+==36400== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
+==36400== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
+==36400== Command: ./sender -f tests_files/greeting.txt ::1 65169 -c -s tests_logs/advanced_tests/greeting/with_FEC/greeting_sender_stats.csv
+==36400== Parent PID: 36367
+==36400== 
+==36400== 
+==36400== Process terminating with default action of signal 2 (SIGINT)
+==36400==    at 0x498D995: poll (poll.c:29)
+==36400==    by 0x1095F6: main (in /home/vany/Desktop/school/networking/project_trtp/sender)
+==36400== 
+==36400== HEAP SUMMARY:
+==36400==     in use at exit: 2,756 bytes in 5 blocks
+==36400==   total heap usage: 7 allocs, 2 frees, 2,836 bytes allocated
+==36400== 
+==36400== 8 bytes in 1 blocks are definitely lost in loss record 1 of 5
+==36400==    at 0x483DD99: calloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
+==36400==    by 0x1095AA: main (in /home/vany/Desktop/school/networking/project_trtp/sender)
+==36400== 
+==36400== 2,748 (1,568 direct, 1,180 indirect) bytes in 1 blocks are definitely lost in loss record 5 of 5
+==36400==    at 0x483DD99: calloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
+==36400==    by 0x10AF9B: state_new (in /home/vany/Desktop/school/networking/project_trtp/sender)
+==36400==    by 0x1095CB: main (in /home/vany/Desktop/school/networking/project_trtp/sender)
+==36400== 
+==36400== LEAK SUMMARY:
+==36400==    definitely lost: 1,576 bytes in 2 blocks
+==36400==    indirectly lost: 1,180 bytes in 3 blocks
+==36400==      possibly lost: 0 bytes in 0 blocks
+==36400==    still reachable: 0 bytes in 0 blocks
+==36400==         suppressed: 0 bytes in 0 blocks
+==36400== 
+==36400== For lists of detected and suppressed errors, rerun with: -s
+==36400== ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
diff --git a/tests_logs/advanced_tests/greeting/with_FEC/greeting_receiver_stats.csv b/tests_logs/advanced_tests/greeting/with_FEC/greeting_receiver_stats.csv
index 6b0681cf928b713907fd74d0613a21845165739d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/tests_logs/advanced_tests/greeting/with_FEC/greeting_receiver_stats.csv
+++ b/tests_logs/advanced_tests/greeting/with_FEC/greeting_receiver_stats.csv
@@ -1,12 +0,0 @@
-data_sent:0
-data_received:3
-data_truncated_received:0
-fec_sent:0
-fec_received:0
-ack_sent:2
-ack_received:0
-nack_received:0
-packet_ignored:0
-throughput:47.666336
-packet_duplicated:1
-packet_recovered:0
diff --git a/tests_logs/advanced_tests/greeting/with_FEC/greeting_sender_stats.csv b/tests_logs/advanced_tests/greeting/with_FEC/greeting_sender_stats.csv
index bc7c5b7e4536879356acf12cf3be45307f1cae05..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/tests_logs/advanced_tests/greeting/with_FEC/greeting_sender_stats.csv
+++ b/tests_logs/advanced_tests/greeting/with_FEC/greeting_sender_stats.csv
@@ -1,13 +0,0 @@
-data_sent:3
-data_received:0
-data_truncated_received:0
-fec_sent:1
-fec_received:0
-ack_sent:0
-ack_received:2
-nack_received:0
-packet_ignored:0
-throughput:23.295319
-min_rtt:1998
-max_rtt:2113
-packet_retransmitted:1
diff --git a/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_link.log b/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_link.log
deleted file mode 100644
index 14a69bf7a58aa6df88497ed87578d6eb59c61327..0000000000000000000000000000000000000000
--- a/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_link.log
+++ /dev/null
@@ -1,20 +0,0 @@
-@@ Using random seed: 1650983305
-@@ Using parameters:
-.. port: 65077
-.. forward_port: 65152
-.. delay: 100
-.. jitter: 100
-.. err_rate: 1
-.. cut_rate: 1
-.. loss_rate: 1
-.. seed: 1650983305
-.. link_direction: Forward
-@@ Remote host is ::1 [55093]
-[SEQ   0] Delayed packet by 9 ms
-[SEQ   0] Sent packet (Forward).
-[SEQ   0] Delayed packet by 53 ms
-[SEQ   1] Sent packet (Reverse).
-[SEQ   1] Delayed packet by 7 ms
-[SEQ   1] Sent packet (Forward).
-[SEQ   0] Sent packet (Forward).
-[SEQ   2] Sent packet (Reverse).
diff --git a/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_received_file.txt b/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_received_file.txt
deleted file mode 100644
index c57eff55ebc0c54973903af5f72bac72762cf4f4..0000000000000000000000000000000000000000
--- a/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_received_file.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello World!
\ No newline at end of file
diff --git a/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_receiver.log b/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_receiver.log
deleted file mode 100644
index 1c1369c429fccc9702d1a2f548ebc1c7550801ee..0000000000000000000000000000000000000000
--- a/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_receiver.log
+++ /dev/null
@@ -1,16 +0,0 @@
-[DEBUG] Receiver has following arguments: stats_filename is tests_logs/advanced_tests/greeting/without_FEC/greeting_receiver_stats.csv, listen_ip is ::1, listen_port is 65152
-[DEBUG] Successfully bound to IPv6 address : 0000:0000:0000:0000:0000:0000:0000:0001, port : 65152
-[DEBUG] Successfully connected to IPv6 addresss: 0000:0000:0000:0000:0000:0000:0000:0001, port : 65077
-[DEBUG] Received data packet seqnum 0 with timestamp 984824098 | current_window_size : 31, current_window_start : 0
-[DEBUG] Sent ACK saying we are waiting for 1, timestamp 0
-[DEBUG] Received data packet seqnum 1 with timestamp 0 | current_window_size : 30, current_window_start : 0
-[DEBUG] Going to consume the next 2 packets.
-[DEBUG] Consuming packet : 0 | curr_recv_window = 29, recv_window_start = 0
-[DEBUG] Consuming packet : 1 | curr_recv_window = 30, recv_window_start = 1
-[DEBUG] Received the last packet
-[DEBUG] Received packet [0] Out of window with timestamp 984824098 | receive window start at : 2 (included) till 33 (excluded)
-[DEBUG] Sent ACK saying we are waiting for 2, timestamp 0
-[DEBUG] Done the transfer with done status being true
-[DEBUG] The difference between the two is 2014000.000000 seconds
-[DEBUG] The transfer took 2014.000000 seconds
-[DEBUG] Wrote the transfer statistics to tests_logs/advanced_tests/greeting/without_FEC/greeting_receiver_stats.csv.
diff --git a/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_sender.log b/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_sender.log
deleted file mode 100644
index c4b0e6eb2e134a99888a6b3a2569a7884d92dd8b..0000000000000000000000000000000000000000
--- a/tests_logs/advanced_tests/greeting/without_FEC/adv_greeting_sender.log
+++ /dev/null
@@ -1,24 +0,0 @@
-[DEBUG] Sender has following arguments: 
-		filename is tests_files/greeting.txt,
-		stats_filename is tests_logs/advanced_tests/greeting/without_FEC/greeting_sender_stats.csv,
-		fec_enabled is 0,
-		receiver_ip is ::1,
-		receiver_port is 65077
-[DEBUG] Successfully connected to IPv6 addresss: 0000:0000:0000:0000:0000:0000:0000:0001, port : 65077
-[DEBUG] The sender will send a pkt on the socket, the current sender window size is: 31 | receiver window size: 1
-[DEBUG] The LAST PTYPE_DATA is being sent !
-[DEBUG] Sending the pkt with seqnum: 0
-[DEBUG] The pkt with seqnum: 0 has timeout
-[DEBUG] Sending the pkt with seqnum: 0
-[DEBUG] The sender is reading from the socket.
-[DEBUG] The ACK with the seqnum: 1 has been received
-[DEBUG] The sender is cumulatively acknowledging [0 : 1[ (place in the buffer) | [0, 1[ (seqnum)
-[DEBUG] The sender will send a pkt on the socket, the current sender window size is: 31 | receiver window size: 30
-[DEBUG] The CLOSING pkt is being sent !
-[DEBUG] Sending the pkt with seqnum: 1
-[DEBUG] A timer of -> 30000ms <- has started after sending the last PTYPE_DATA pkt !
-[DEBUG] The sender is reading from the socket.
-[DEBUG] The ACK with the seqnum: 2 has been received
-[DEBUG] The sender is cumulatively acknowledging [1 : 2[ (place in the buffer) | [1, 2[ (seqnum)
-[DEBUG] Sender disconnected
-[DEBUG] Wrote the transfer statistics to tests_logs/advanced_tests/greeting/without_FEC/greeting_sender_stats.csv.
diff --git a/tests_logs/advanced_tests/greeting/without_FEC/adv_valgrind_greeting_receiver.log b/tests_logs/advanced_tests/greeting/without_FEC/adv_valgrind_greeting_receiver.log
deleted file mode 100644
index 5f6ee5e897f9bd117bd31c3074b11952b1a4a5c2..0000000000000000000000000000000000000000
--- a/tests_logs/advanced_tests/greeting/without_FEC/adv_valgrind_greeting_receiver.log
+++ /dev/null
@@ -1,15 +0,0 @@
-==31095== Memcheck, a memory error detector
-==31095== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==31095== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==31095== Command: ./receiver ::1 65152 -s tests_logs/advanced_tests/greeting/without_FEC/greeting_receiver_stats.csv
-==31095== Parent PID: 30999
-==31095== 
-==31095== 
-==31095== HEAP SUMMARY:
-==31095==     in use at exit: 0 bytes in 0 blocks
-==31095==   total heap usage: 14 allocs, 14 frees, 10,400 bytes allocated
-==31095== 
-==31095== All heap blocks were freed -- no leaks are possible
-==31095== 
-==31095== For lists of detected and suppressed errors, rerun with: -s
-==31095== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/tests_logs/advanced_tests/greeting/without_FEC/adv_valgrind_greeting_sender.log b/tests_logs/advanced_tests/greeting/without_FEC/adv_valgrind_greeting_sender.log
deleted file mode 100644
index 9af96f47dba10ab23148e7b609eb8b3e3a728488..0000000000000000000000000000000000000000
--- a/tests_logs/advanced_tests/greeting/without_FEC/adv_valgrind_greeting_sender.log
+++ /dev/null
@@ -1,15 +0,0 @@
-==31096== Memcheck, a memory error detector
-==31096== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==31096== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==31096== Command: ./sender -f tests_files/greeting.txt ::1 65077 -s tests_logs/advanced_tests/greeting/without_FEC/greeting_sender_stats.csv
-==31096== Parent PID: 30999
-==31096== 
-==31096== 
-==31096== HEAP SUMMARY:
-==31096==     in use at exit: 0 bytes in 0 blocks
-==31096==   total heap usage: 9 allocs, 9 frees, 3,892 bytes allocated
-==31096== 
-==31096== All heap blocks were freed -- no leaks are possible
-==31096== 
-==31096== For lists of detected and suppressed errors, rerun with: -s
-==31096== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/tests_logs/advanced_tests/greeting/without_FEC/greeting_receiver_stats.csv b/tests_logs/advanced_tests/greeting/without_FEC/greeting_receiver_stats.csv
deleted file mode 100644
index 871b8b51b8e3f1cae814da55ac74c72393b649c2..0000000000000000000000000000000000000000
--- a/tests_logs/advanced_tests/greeting/without_FEC/greeting_receiver_stats.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-data_sent:0
-data_received:2
-data_truncated_received:0
-fec_sent:0
-fec_received:0
-ack_sent:2
-ack_received:0
-nack_received:0
-packet_ignored:0
-throughput:47.666336
-packet_duplicated:0
-packet_recovered:0
diff --git a/tests_logs/advanced_tests/greeting/without_FEC/greeting_sender_stats.csv b/tests_logs/advanced_tests/greeting/without_FEC/greeting_sender_stats.csv
deleted file mode 100644
index f753a38ad773d672430f4eefe441923515938ae0..0000000000000000000000000000000000000000
--- a/tests_logs/advanced_tests/greeting/without_FEC/greeting_sender_stats.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-data_sent:3
-data_received:0
-data_truncated_received:0
-fec_sent:0
-fec_received:0
-ack_sent:0
-ack_received:2
-nack_received:0
-packet_ignored:0
-throughput:23.874659
-min_rtt:1998
-max_rtt:2014
-packet_retransmitted:1
diff --git a/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_link.log b/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_link.log
index d8c623dafb12014a16694bd87eae4912261c9a24..d60443427c67e27434dafa2b4d7d82f05b74d9f1 100644
--- a/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_link.log
+++ b/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_link.log
@@ -1,29 +1,11 @@
-@@ Using random seed: 1650983314
+@@ Using random seed: 1650987718
 @@ Using parameters:
-.. port: 65022
-.. forward_port: 65119
+.. port: 65002
+.. forward_port: 65137
 .. delay: 100
 .. jitter: 100
 .. err_rate: 1
 .. cut_rate: 1
 .. loss_rate: 1
-.. seed: 1650983314
+.. seed: 1650987718
 .. link_direction: Forward
-@@ Remote host is ::1 [60845]
-[SEQ   0] Delayed packet by 22 ms
-[SEQ   0] Sent packet (Forward).
-[SEQ   0] Delayed packet by 53 ms
-[SEQ   1] Sent packet (Reverse).
-[SEQ   1] Delayed packet by 129 ms
-[SEQ   2] Delayed packet by 79 ms
-[SEQ   0] Sent packet (Forward).
-[SEQ   2] Sent packet (Forward).
-[SEQ   1] Sent packet (Forward).
-[SEQ   3] Sent packet (Reverse).
-[SEQ   3] Delayed packet by 138 ms
-[FEC   0] Delayed packet by 147 ms
-[SEQ   3] Sent packet (Forward).
-[FEC   0] Sent packet (Forward).
-[SEQ   3] Delayed packet by 115 ms
-[SEQ   4] Sent packet (Reverse).
-[SEQ   3] Sent packet (Forward).
diff --git a/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_received_file.txt b/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_received_file.txt
index a18b03ec08fdc53c1f0a5e0fc9187b5a0f18568f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_received_file.txt
+++ b/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_received_file.txt
@@ -1,29 +0,0 @@
-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 
-network course. But when you manage to thrive throgh tough times then sweet things are 
-ahead. So good luck have a nice day of testing and remember : Tough Times Never Last.
-
-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'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 :')
-
-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 
-network course. But when you manage to thrive throgh tough times then sweet things are 
-ahead. So good luck have a nice day of testing and remember : Tough Times Never Last.
-
-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'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,
diff --git a/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_receiver.log b/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_receiver.log
index 68d46c0f1ada4b5fb1ffd9b28df1cc375e69d8f3..d4228c71b69cf5b9ab5fd290a72ad30185f67615 100644
--- a/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_receiver.log
+++ b/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_receiver.log
@@ -1,22 +1,2 @@
-[DEBUG] Receiver has following arguments: stats_filename is tests_logs/advanced_tests/long_message/with_FEC/long_message_receiver_stats.csv, listen_ip is ::1, listen_port is 65119
-[DEBUG] Successfully bound to IPv6 address : 0000:0000:0000:0000:0000:0000:0000:0001, port : 65119
-[DEBUG] Successfully connected to IPv6 addresss: 0000:0000:0000:0000:0000:0000:0000:0001, port : 65022
-[DEBUG] Received data packet seqnum 0 with timestamp 0 | current_window_size : 31, current_window_start : 0
-[DEBUG] Sent ACK saying we are waiting for 1, timestamp 0
-[DEBUG] Received data packet seqnum 0 with timestamp 0 | current_window_size : 30, current_window_start : 0
-[DEBUG] Received data packet seqnum 2 with timestamp 984824098 | current_window_size : 30, current_window_start : 0
-[DEBUG] Received data packet seqnum 1 with timestamp 0 | current_window_size : 29, current_window_start : 0
-[DEBUG] Sent ACK saying we are waiting for 3, timestamp 0
-[DEBUG] Received data packet seqnum 3 with timestamp 0 | current_window_size : 28, current_window_start : 0
-[DEBUG] Going to consume the next 4 packets.
-[DEBUG] Consuming packet : 0 | curr_recv_window = 27, recv_window_start = 0
-[DEBUG] Consuming packet : 1 | curr_recv_window = 28, recv_window_start = 1
-[DEBUG] Consuming packet : 2 | curr_recv_window = 29, recv_window_start = 2
-[DEBUG] Consuming packet : 3 | curr_recv_window = 30, recv_window_start = 3
-[DEBUG] Received the last packet
-[DEBUG] Received packet [0] Out of window with timestamp 0 | receive window start at : 4 (included) till 35 (excluded)
-[DEBUG] Sent ACK saying we are waiting for 4, timestamp 0
-[DEBUG] Done the transfer with done status being true
-[DEBUG] The difference between the two is 4142000.000000 seconds
-[DEBUG] The transfer took 4142.000000 seconds
-[DEBUG] Wrote the transfer statistics to tests_logs/advanced_tests/long_message/with_FEC/long_message_receiver_stats.csv.
+[DEBUG] Receiver has following arguments: stats_filename is tests_logs/advanced_tests/long_message/with_FEC/long_message_receiver_stats.csv, listen_ip is ::1, listen_port is 65137
+[DEBUG] Successfully bound to IPv6 address : 0000:0000:0000:0000:0000:0000:0000:0001, port : 65137
diff --git a/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_sender.log b/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_sender.log
index 265b165e9099462d2aeb8b3f902b165af1be0ddd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_sender.log
+++ b/tests_logs/advanced_tests/long_message/with_FEC/adv_long_message_sender.log
@@ -1,36 +0,0 @@
-[DEBUG] Sender has following arguments: 
-		filename is tests_files/long_message.txt,
-		stats_filename is tests_logs/advanced_tests/long_message/with_FEC/long_message_sender_stats.csv,
-		fec_enabled is 1,
-		receiver_ip is ::1,
-		receiver_port is 65022
-[DEBUG] Successfully connected to IPv6 addresss: 0000:0000:0000:0000:0000:0000:0000:0001, port : 65022
-[DEBUG] The sender will send a pkt on the socket, the current sender window size is: 31 | receiver window size: 1
-[DEBUG] Sending the pkt with seqnum: 0
-[DEBUG] The pkt with seqnum: 0 has timeout
-[DEBUG] Sending the pkt with seqnum: 0
-[DEBUG] The sender is reading from the socket.
-[DEBUG] The ACK with the seqnum: 1 has been received
-[DEBUG] The sender is cumulatively acknowledging [0 : 1[ (place in the buffer) | [0, 1[ (seqnum)
-[DEBUG] The sender will send a pkt on the socket, the current sender window size is: 31 | receiver window size: 30
-[DEBUG] Sending the pkt with seqnum: 1
-[DEBUG] The sender will send a pkt on the socket, the current sender window size is: 30 | receiver window size: 29
-[DEBUG] The LAST PTYPE_DATA is being sent !
-[DEBUG] Sending the pkt with seqnum: 2
-[DEBUG] The sender is reading from the socket.
-[DEBUG] The ACK with the seqnum: 3 has been received
-[DEBUG] The sender is cumulatively acknowledging [1 : 3[ (place in the buffer) | [1, 3[ (seqnum)
-[DEBUG] The sender will send a pkt on the socket, the current sender window size is: 31 | receiver window size: 29
-[DEBUG] The CLOSING pkt is being sent !
-[DEBUG] Sending the pkt with seqnum: 3
-[DEBUG] A timer of -> 30000ms <- has started after sending the last PTYPE_DATA pkt !
-[DEBUG] The sender will send a pkt on the socket, the current sender window size is: 30 | receiver window size: 28
-[DEBUG] Sending LAST FEC pkt with seqnum: 0
-[DEBUG] A timer of -> 30000ms <- has started after sending the last PTYPE_DATA pkt !
-[DEBUG] The pkt with seqnum: 3 has timeout
-[DEBUG] Sending the pkt with seqnum: 3
-[DEBUG] The sender is reading from the socket.
-[DEBUG] The ACK with the seqnum: 4 has been received
-[DEBUG] The sender is cumulatively acknowledging [3 : 4[ (place in the buffer) | [3, 4[ (seqnum)
-[DEBUG] Sender disconnected
-[DEBUG] Wrote the transfer statistics to tests_logs/advanced_tests/long_message/with_FEC/long_message_sender_stats.csv.
diff --git a/tests_logs/advanced_tests/long_message/with_FEC/adv_valgrind_long_message_receiver.log b/tests_logs/advanced_tests/long_message/with_FEC/adv_valgrind_long_message_receiver.log
index e33dcc9d5071b1fb89012488786ca485b22f3d70..231a08ffaf91da47d5d1343abcf538e118d3002b 100644
--- a/tests_logs/advanced_tests/long_message/with_FEC/adv_valgrind_long_message_receiver.log
+++ b/tests_logs/advanced_tests/long_message/with_FEC/adv_valgrind_long_message_receiver.log
@@ -1,15 +1,6 @@
-==31160== Memcheck, a memory error detector
-==31160== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==31160== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==31160== Command: ./receiver ::1 65119 -s tests_logs/advanced_tests/long_message/with_FEC/long_message_receiver_stats.csv
-==31160== Parent PID: 31130
-==31160== 
-==31160== 
-==31160== HEAP SUMMARY:
-==31160==     in use at exit: 0 bytes in 0 blocks
-==31160==   total heap usage: 20 allocs, 20 frees, 13,568 bytes allocated
-==31160== 
-==31160== All heap blocks were freed -- no leaks are possible
-==31160== 
-==31160== For lists of detected and suppressed errors, rerun with: -s
-==31160== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+==36433== Memcheck, a memory error detector
+==36433== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
+==36433== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
+==36433== Command: ./receiver ::1 65137 -s tests_logs/advanced_tests/long_message/with_FEC/long_message_receiver_stats.csv
+==36433== Parent PID: 36403
+==36433== 
diff --git a/tests_logs/advanced_tests/long_message/with_FEC/adv_valgrind_long_message_sender.log b/tests_logs/advanced_tests/long_message/with_FEC/adv_valgrind_long_message_sender.log
index bc649bf3e52313dcc275a0978ce700dbc01fecfc..44cff375100e902ef494d2aca3162b4c94244b58 100644
--- a/tests_logs/advanced_tests/long_message/with_FEC/adv_valgrind_long_message_sender.log
+++ b/tests_logs/advanced_tests/long_message/with_FEC/adv_valgrind_long_message_sender.log
@@ -1,15 +1,26 @@
-==31161== Memcheck, a memory error detector
-==31161== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
-==31161== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
-==31161== Command: ./sender -f tests_files/long_message.txt ::1 65022 -c -s tests_logs/advanced_tests/long_message/with_FEC/long_message_sender_stats.csv
-==31161== Parent PID: 31130
-==31161== 
-==31161== 
-==31161== HEAP SUMMARY:
-==31161==     in use at exit: 0 bytes in 0 blocks
-==31161==   total heap usage: 13 allocs, 13 frees, 6,004 bytes allocated
-==31161== 
-==31161== All heap blocks were freed -- no leaks are possible
-==31161== 
-==31161== For lists of detected and suppressed errors, rerun with: -s
-==31161== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+==36434== Memcheck, a memory error detector
+==36434== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
+==36434== Using Valgrind-3.15.0 and LibVEX; rerun with -h for copyright info
+==36434== Command: ./sender -f tests_files/long_message.txt ::1 65002 -c -s tests_logs/advanced_tests/long_message/with_FEC/long_message_sender_stats.csv
+==36434== Parent PID: 36403
+==36434== 
+==36434== 
+==36434== Process terminating with default action of signal 2 (SIGINT)
+==36434==    at 0x49890A5: write (write.c:26)
+==36434==    by 0x4909EBC: _IO_file_write@@GLIBC_2.2.5 (fileops.c:1181)
+==36434==    by 0x490A7D7: new_do_write (fileops.c:449)
+==36434==    by 0x490A7D7: _IO_new_file_xsputn (fileops.c:1255)
+==36434==    by 0x490A7D7: _IO_file_xsputn@@GLIBC_2.2.5 (fileops.c:1197)
+==36434==    by 0x48F4F82: buffered_vfprintf (vfprintf-internal.c:2395)
+==36434==    by 0x48F1D53: __vfprintf_internal (vfprintf-internal.c:1346)
+==36434==    by 0x49A9152: __fprintf_chk (fprintf_chk.c:33)
+==36434==    by 0x1094E5: main (in /home/vany/Desktop/school/networking/project_trtp/sender)
+==36434== 
+==36434== HEAP SUMMARY:
+==36434==     in use at exit: 0 bytes in 0 blocks
+==36434==   total heap usage: 0 allocs, 0 frees, 0 bytes allocated
+==36434== 
+==36434== All heap blocks were freed -- no leaks are possible
+==36434== 
+==36434== For lists of detected and suppressed errors, rerun with: -s
+==36434== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/tests_logs/advanced_tests/long_message/with_FEC/long_message_receiver_stats.csv b/tests_logs/advanced_tests/long_message/with_FEC/long_message_receiver_stats.csv
index 032a883990951c8e5be2b3c48ba01f5a1fe99fdf..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/tests_logs/advanced_tests/long_message/with_FEC/long_message_receiver_stats.csv
+++ b/tests_logs/advanced_tests/long_message/with_FEC/long_message_receiver_stats.csv
@@ -1,12 +0,0 @@
-data_sent:0
-data_received:5
-data_truncated_received:0
-fec_sent:0
-fec_received:0
-ack_sent:3
-ack_received:0
-nack_received:0
-packet_ignored:0
-throughput:2916.465576
-packet_duplicated:1
-packet_recovered:0
diff --git a/tests_logs/advanced_tests/long_message/with_FEC/long_message_sender_stats.csv b/tests_logs/advanced_tests/long_message/with_FEC/long_message_sender_stats.csv
index 0d3bb5adec8897f1308b0350916ead8b0e01c787..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/tests_logs/advanced_tests/long_message/with_FEC/long_message_sender_stats.csv
+++ b/tests_logs/advanced_tests/long_message/with_FEC/long_message_sender_stats.csv
@@ -1,13 +0,0 @@
-data_sent:6
-data_received:0
-data_truncated_received:0
-fec_sent:1
-fec_received:0
-ack_sent:0
-ack_received:3
-nack_received:0
-packet_ignored:0
-throughput:2001.657104
-min_rtt:1997
-max_rtt:2026
-packet_retransmitted:2