diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc
index 2d45be9ee..898066578 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc
@@ -2,7 +2,10 @@
  * \file gps_l1_ca_pcps_acquisition_test_fpga.cc
  * \brief  This class implements an acquisition test for
  * GpsL1CaPcpsAcquisitionFpga class based on some input parameters.
- * \author Marc Majoral, 2017. mmajoral(at)cttc.cat
+ * \authors <ul>
+ *          <li> Marc Majoral, 2019. mmajoral(at)cttc.cat
+ *          <li> Luis Esteve, 2012. luis(at)epsilon-formacion.com
+ *          </ul>
  *
  * -------------------------------------------------------------------------
  *
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
index df2472d50..748e5532a 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
@@ -2,7 +2,10 @@
  * \file gps_l1_ca_pcps_acquisition_test_fpga.cc
  * \brief  This class implements an acquisition test for
  * GpsL1CaPcpsAcquisitionFpga class based on some input parameters.
- * \author Marc Majoral, 2017. mmajoral(at)cttc.cat
+ * \authors <ul>
+ *          <li> Marc Majoral, 2019. mmajoral(at)cttc.cat
+ *          <li> Luis Esteve, 2012. luis(at)epsilon-formacion.com
+ *          </ul>
  *
  * -------------------------------------------------------------------------
  *
diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
index 3cb1a81e0..77979cfe8 100644
--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc
@@ -2,7 +2,10 @@
  * \file hybrid_observables_test_fpga.cc
  * \brief  This class implements a tracking test for Galileo_E5a_DLL_PLL_Tracking
  *  implementation based on some input parameters.
- * \author Javier Arribas, 2019. jarribas(at)cttc.es
+ * \authors <ul>
+ *          <li> Marc Majoral, 2019. mmajoral(at)cttc.cat
+ *          <li> Javier Arribas, 2018. jarribas(at)cttc.es
+ *          </ul>
  *
  *
  * -------------------------------------------------------------------------
@@ -350,7 +353,6 @@ void* handler_DMA_obs_test(void* arguments)
 	int32_t nsamples_tx = args->nsamples_tx;
 
     std::vector<int8_t> input_samples(MAX_INPUT_SAMPLES_TOTAL * 2);
-    std::vector<int8_t> input_samples2(MAX_INPUT_SAMPLES_TOTAL * 2);
     std::vector<int8_t> input_samples_dma(MAX_INPUT_SAMPLES_TOTAL * 2 * 2);
     bool file_completed = false;
     int32_t nsamples_remaining;
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
index fa9f4085b..f9a7b8da8 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
@@ -2,8 +2,10 @@
  * \file tracking_pull-in_test_fpga.cc
  * \brief  This class implements a tracking Pull-In test for FPGA HW accelerator
  *  implementations based on some input parameters.
- * \author     Marc Majoral, 2019. majoralmarc(at)cttc.es
- *             Javier Arribas, 2018. jarribas(at)cttc.es
+ * \authors <ul>
+ *          <li> Marc Majoral, 2019. mmajoral(at)cttc.cat
+ *          <li> Javier Arribas, 2018. jarribas(at)cttc.es
+ *          </ul>
  *
  *
  * -------------------------------------------------------------------------
@@ -31,20 +33,16 @@
  */
 
 #include "GPS_L1_CA.h"
-//#include "GPS_L2C.h"
 #include "GPS_L5.h"
 #include "Galileo_E1.h"
 #include "Galileo_E5a.h"
 #include "acquisition_msg_rx.h"
 #include "concurrent_queue.h"
 #include "galileo_e1_pcps_ambiguous_acquisition_fpga.h"
-//#include "galileo_e5a_noncoherent_iq_acquisition_caf.h"
 #include "galileo_e5a_pcps_acquisition_fpga.h"
 #include "gnss_block_factory.h"
 #include "gnuplot_i.h"
 #include "gps_l1_ca_pcps_acquisition_fpga.h"
-//#include "gps_l1_ca_pcps_acquisition_fine_doppler.h"
-//#include "gps_l2_m_pcps_acquisition.h"
 #include "gps_l5i_pcps_acquisition_fpga.h"
 #include "in_memory_configuration.h"
 #include "signal_generator_flags.h"
@@ -173,7 +171,6 @@ void* handler_DMA_trk_pull_in_test(void* arguments)
 	int32_t nsamples_tx = args->nsamples_tx;
 
     std::vector<int8_t> input_samples(MAX_INPUT_SAMPLES_TOTAL * 2);
-    std::vector<int8_t> input_samples2(MAX_INPUT_SAMPLES_TOTAL * 2);
     std::vector<int8_t> input_samples_dma(MAX_INPUT_SAMPLES_TOTAL * 2 * 2);
     bool file_completed = false;
     int32_t nsamples_remaining;