diff --git a/README.md b/README.md
index 089cdd0326..41aa474253 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ This section describes how to set up the compilation environment in GNU/Linux or
 GNU/Linux 
 ----------
 
- * Tested distributions: Ubuntu 14.04 LTS, 14.10, 15.04 and 15.10, Debian 8.0 "jessie", Linaro 15.03 
+ * Tested distributions: Ubuntu from 14.04 LTS to 16.04 LTS, Debian 8.0 "jessie", Linaro 15.03 
  * Known to work but not continually tested: Arch Linux, Fedora, and openSUSE
  * Supported microprocessor architectures: 
    * i386: Intel x86 instruction set (32-bit microprocessors). 
@@ -37,7 +37,20 @@ $ sudo apt-get install build-essential cmake git libboost-dev libboost-date-time
        libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev libgtest-dev
 ~~~~~~
 
-Once you have installed these packages, you can jump directly to [how to download the source code and build GNSS-SDR](#download-and-build-linux). Alternatively, if you need to manually build and install those libraries, please keep reading.
+Alternatively, and starting from Ubuntu 16.04 LTS, you can install all required dependencies by adding the line
+
+~~~~~~
+deb-src http://us.archive.ubuntu.com/ubuntu/ xenial universe
+~~~~~~
+
+at your ```/etc/apt/sources.list``` file and doing:
+
+~~~~~~ 
+$ sudo apt-get update 
+$ sudo apt-get build-dep gnss-sdr
+~~~~~~ 
+
+Once you have installed these packages, you can jump directly to [how to download the source code and build GNSS-SDR](#download-and-build-linux). Otherwise, if you need to manually build and install those libraries, please keep reading.
 
 Note for Ubuntu 14.04 LTS "trusty" users: you will need to build from source and install GNU Radio manually, as explained below, since GNSS-SDR requires gnuradio-dev >= 3.7.3, and Ubuntu 14.04 came with 3.7.2. Install all the packages above BUT EXCEPT ```libuhd-dev```, ```gnuradio-dev``` and ```gr-osmosdr``` (and remove them if they are already installed in your machine), and install those dependencies using PyBOMBS.
 
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h
index 8879896798..b0f87026ef 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h
@@ -38,7 +38,9 @@
  * \b Overview
  *
  * VOLK_GNSSSDR kernel that computes the sine and cosine with a fixed
- * phase increment \p phase_inc per sample, providing the output in a complex vector (cosine, sine)
+ * phase increment \p phase_inc per sample, providing the output in a complex vector (cosine, sine).
+ * WARNING: it is not IEEE compliant, but the max absolute error on sines is 2^-24 on the range [-8192, 8192].
+ *          As a rule of thumb, keep initial phase + phase_inc * num_points within that range.
  *
  * <b>Dispatcher Prototype</b>
  * \code
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincospuppet_32fc.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincospuppet_32fc.h
index 07d3bf5d2a..2dd6b9c077 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincospuppet_32fc.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_s32f_sincospuppet_32fc.h
@@ -87,7 +87,7 @@ static inline void volk_gnsssdr_s32f_sincospuppet_32fc_u_sse2(lv_32fc_t* out, co
 static inline void volk_gnsssdr_s32f_sincospuppet_32fc_a_avx2(lv_32fc_t* out, const float phase_inc, unsigned int num_points)
 {
     float phase[1];
-    phase[0] = 3;
+    phase[0] = 0.1;
     volk_gnsssdr_s32f_sincos_32fc_a_avx2(out, phase_inc, phase, num_points);
 }
 #endif  /* LV_HAVE_AVX2  */
@@ -97,7 +97,7 @@ static inline void volk_gnsssdr_s32f_sincospuppet_32fc_a_avx2(lv_32fc_t* out, co
 static inline void volk_gnsssdr_s32f_sincospuppet_32fc_u_avx2(lv_32fc_t* out, const float phase_inc, unsigned int num_points)
 {
     float phase[1];
-    phase[0] = 3;
+    phase[0] = 0.1;
     volk_gnsssdr_s32f_sincos_32fc_u_avx2(out, phase_inc, phase, num_points);
 }
 #endif  /* LV_HAVE_AVX2  */
diff --git a/src/tests/control_thread/control_thread_test.cc b/src/tests/control_thread/control_thread_test.cc
index b31e18005c..c5cd157848 100644
--- a/src/tests/control_thread/control_thread_test.cc
+++ b/src/tests/control_thread/control_thread_test.cc
@@ -62,19 +62,17 @@ TEST(Control_Thread_Test, InstantiateRunControlMessages)
     config->set_property("SignalSource.repeat", "true");
     config->set_property("SignalConditioner.implementation", "Pass_Through");
     config->set_property("SignalConditioner.item_type", "gr_complex");
-    config->set_property("Channels_GPS.count", "2");
-    config->set_property("Channels_Galileo.count", "0");
+    config->set_property("Channels_1C.count", "2");
+    config->set_property("Channels_1E.count", "0");
     config->set_property("Channels.in_acquisition", "1");
-    config->set_property("Channel.system", "GPS");
-    config->set_property("Channel.signal", "1C");
-    config->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition");
-    config->set_property("Acquisition_GPS.threshold", "1");
-    config->set_property("Acquisition_GPS.doppler_max", "5000");
-    config->set_property("Acquisition_GPS.doppler_min", "-5000");
-    config->set_property("Tracking_GPS.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
-    config->set_property("Tracking_GPS.item_type", "gr_complex");
-    config->set_property("TelemetryDecoder_GPS.implementation", "GPS_L1_CA_Telemetry_Decoder");
-    config->set_property("TelemetryDecoder_GPS.item_type", "gr_complex");
+    config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition");
+    config->set_property("Acquisition_1C.threshold", "1");
+    config->set_property("Acquisition_1C.doppler_max", "5000");
+    config->set_property("Acquisition_1C.doppler_min", "-5000");
+    config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
+    config->set_property("Tracking_1C.item_type", "gr_complex");
+    config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder");
+    config->set_property("TelemetryDecoder_1C.item_type", "gr_complex");
     config->set_property("Observables.implementation", "GPS_L1_CA_Observables");
     config->set_property("Observables.item_type", "gr_complex");
     config->set_property("PVT.implementation", "GPS_L1_CA_PVT");
@@ -127,19 +125,17 @@ TEST(Control_Thread_Test, InstantiateRunControlMessages2)
     config->set_property("SignalSource.repeat", "true");
     config->set_property("SignalConditioner.implementation", "Pass_Through");
     config->set_property("SignalConditioner.item_type", "gr_complex");
-    config->set_property("Channels_GPS.count", "4");
-    config->set_property("Channels_Galileo.count", "0");
+    config->set_property("Channels_1C.count", "4");
+    config->set_property("Channels_1E.count", "0");
     config->set_property("Channels.in_acquisition", "1");
-    config->set_property("Channel.system", "GPS");
-    config->set_property("Channel.signal", "1C");
-    config->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition");
-    config->set_property("Acquisition_GPS.threshold", "1");
-    config->set_property("Acquisition_GPS.doppler_max", "5000");
-    config->set_property("Acquisition_GPS.doppler_min", "-5000");
-    config->set_property("Tracking_GPS.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
-    config->set_property("Tracking_GPS.item_type", "gr_complex");
-    config->set_property("TelemetryDecoder_GPS.implementation", "GPS_L1_CA_Telemetry_Decoder");
-    config->set_property("TelemetryDecoder_GPS.item_type", "gr_complex");
+    config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition");
+    config->set_property("Acquisition_1C.threshold", "1");
+    config->set_property("Acquisition_1C.doppler_max", "5000");
+    config->set_property("Acquisition_1C.doppler_min", "-5000");
+    config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
+    config->set_property("Tracking_1C.item_type", "gr_complex");
+    config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder");
+    config->set_property("TelemetryDecoder_1C.item_type", "gr_complex");
     config->set_property("Observables.implementation", "GPS_L1_CA_Observables");
     config->set_property("Observables.item_type", "gr_complex");
     config->set_property("PVT.implementation", "GPS_L1_CA_PVT");
diff --git a/src/tests/flowgraph/gnss_flowgraph_test.cc b/src/tests/flowgraph/gnss_flowgraph_test.cc
index 3772ad3b38..7719dc8d1d 100644
--- a/src/tests/flowgraph/gnss_flowgraph_test.cc
+++ b/src/tests/flowgraph/gnss_flowgraph_test.cc
@@ -57,15 +57,13 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStopOldNotation)
     std::string filename = path + "signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat";
     config->set_property("SignalSource.filename", filename);
     config->set_property("SignalConditioner.implementation", "Pass_Through");
-    config->set_property("Channels_GPS.count", "1");
+    config->set_property("Channels_1C.count", "1");
     config->set_property("Channels.in_acquisition", "1");
-    config->set_property("Channel.system", "GPS");
-    config->set_property("Channel.signal", "1C");
-    config->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition");
-    config->set_property("Acquisition_GPS.threshold", "1");
-    config->set_property("Acquisition_GPS.doppler_max", "5000");
-    config->set_property("Tracking_GPS.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
-    config->set_property("TelemetryDecoder_GPS.implementation", "GPS_L1_CA_Telemetry_Decoder");
+    config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition");
+    config->set_property("Acquisition_1C.threshold", "1");
+    config->set_property("Acquisition_1C.doppler_max", "5000");
+    config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
+    config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder");
     config->set_property("Observables.implementation", "GPS_L1_CA_Observables");
     config->set_property("PVT.implementation", "GPS_L1_CA_PVT");
 
@@ -166,22 +164,6 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStopHybrid)
     config->set_property("Channels_1B.count", "8");
     config->set_property("Channels.in_acquisition", "1");
 
-    config->set_property("Channel0.signal", "1C");
-    config->set_property("Channel1.signal", "1C");
-    config->set_property("Channel2.signal", "1C");
-    config->set_property("Channel3.signal", "1C");
-    config->set_property("Channel4.signal", "1C");
-    config->set_property("Channel5.signal", "1C");
-    config->set_property("Channel7.signal", "1C");
-    config->set_property("Channel8.signal", "1B");
-    config->set_property("Channel9.signal", "1B");
-    config->set_property("Channel10.signal", "1B");
-    config->set_property("Channel11.signal", "1B");
-    config->set_property("Channel12.signal", "1B");
-    config->set_property("Channel13.signal", "1B");
-    config->set_property("Channel14.signal", "1B");
-    config->set_property("Channel15.signal", "1B");
-
     config->set_property("Acquisition_1C0.implementation", "GPS_L1_CA_PCPS_Acquisition");
     config->set_property("Acquisition_1C0.threshold", "1");
     config->set_property("Acquisition_1C0.doppler_max", "5000");
diff --git a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc
index 917e030ea6..22544821c0 100644
--- a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc
+++ b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc
@@ -34,6 +34,7 @@
 #include <cstdlib>
 #include <ctime>
 #include <iostream>
+#include <boost/make_shared.hpp>
 #include <gnuradio/top_block.h>
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/analog/sig_source_waveform.h>
@@ -50,6 +51,58 @@
 
 #include "galileo_e1_pcps_ambiguous_acquisition.h"
 
+// ######## GNURADIO BLOCK MESSAGE RECEVER #########
+class GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx;
+
+typedef boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx> GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr;
+
+GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make();
+
+class GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx : public gr::block
+{
+private:
+    friend GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make();
+    void msg_handler_events(pmt::pmt_t msg);
+    GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx();
+
+public:
+    int* rx_message;
+    ~GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx(); //!< Default destructor
+
+};
+
+GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make()
+{
+    return GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr(new GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx());
+}
+
+void GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
+{
+    try {
+        long int message=pmt::to_long(msg);
+        *rx_message=message;
+    }catch(boost::bad_any_cast& e)
+    {
+            LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n";
+            *rx_message = 0;
+    }
+}
+
+GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx() :
+    gr::block("GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
+{
+
+    this->message_port_register_in(pmt::mp("events"));
+    this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+
+}
+
+GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx()
+{}
+
+
+// ###########################################################
+
 class GalileoE1PcpsAmbiguousAcquisitionTest: public ::testing::Test
 {
 protected:
@@ -58,8 +111,6 @@ class GalileoE1PcpsAmbiguousAcquisitionTest: public ::testing::Test
         factory = std::make_shared<GNSSBlockFactory>();
         config = std::make_shared<InMemoryConfiguration>();
         item_size = sizeof(gr_complex);
-        stop = false;
-        message = 0;
         gnss_synchro = Gnss_Synchro();
 }
 
@@ -67,9 +118,6 @@ class GalileoE1PcpsAmbiguousAcquisitionTest: public ::testing::Test
     {}
 
     void init();
-    void start_queue();
-    void wait_message();
-    void stop_queue();
 
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
@@ -77,9 +125,6 @@ class GalileoE1PcpsAmbiguousAcquisitionTest: public ::testing::Test
     std::shared_ptr<InMemoryConfiguration> config;
     Gnss_Synchro gnss_synchro;
     size_t item_size;
-    bool stop;
-    int message;
-    boost::thread ch_thread;
 };
 
 
@@ -104,29 +149,6 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::init()
     config->set_property("Acquisition1.cboc", "true");
 }
 
-void GalileoE1PcpsAmbiguousAcquisitionTest::start_queue()
-{
-    stop = false;
-    ch_thread = boost::thread(&GalileoE1PcpsAmbiguousAcquisitionTest::wait_message, this);
-}
-
-
-void GalileoE1PcpsAmbiguousAcquisitionTest::wait_message()
-{
-    while (!stop)
-        {
-            channel_internal_queue.wait_and_pop(message);
-            stop_queue();
-        }
-}
-
-void GalileoE1PcpsAmbiguousAcquisitionTest::stop_queue()
-{
-    stop = true;
-}
-
-
-
 TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, Instantiate)
 {
     init();
@@ -142,11 +164,14 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ConnectAndRun)
     struct timeval tv;
     long long int begin = 0;
     long long int end = 0;
+    int message=0;
     top_block = gr::make_top_block("Acquisition test");
     queue = gr::msg_queue::make(0);
     init();
     std::shared_ptr<GNSSBlockInterface> acq_ = factory->GetBlock(config, "Acquisition", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 1, queue);
     std::shared_ptr<AcquisitionInterface> acquisition = std::dynamic_pointer_cast<AcquisitionInterface>(acq_);
+    boost::shared_ptr<GpsL2MPcpsAcquisitionTest_msg_rx> msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make();
+    msg_rx->rx_message=&message; // set message pointer to get last acquisition message
 
     ASSERT_NO_THROW( {
         acquisition->connect(top_block);
@@ -154,6 +179,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ConnectAndRun)
         boost::shared_ptr<gr::block> valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue);
         top_block->connect(source, 0, valve, 0);
         top_block->connect(valve, 0, acquisition->get_left_block(), 0);
+        top_block->msg_connect(acquisition->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events"));
     }) << "Failure connecting the blocks of acquisition test." << std::endl;
 
     EXPECT_NO_THROW( {
@@ -172,6 +198,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults)
     struct timeval tv;
     long long int begin = 0;
     long long int end = 0;
+    int message=0;
     double expected_delay_samples = 2920; //18250;
     double expected_doppler_hz = -632;
     init();
@@ -179,6 +206,8 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults)
     queue = gr::msg_queue::make(0);
     std::shared_ptr<GNSSBlockInterface> acq_ = factory->GetBlock(config, "Acquisition", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 1, queue);
     std::shared_ptr<GalileoE1PcpsAmbiguousAcquisition> acquisition = std::dynamic_pointer_cast<GalileoE1PcpsAmbiguousAcquisition>(acq_);
+    boost::shared_ptr<GpsL2MPcpsAcquisitionTest_msg_rx> msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make();
+    msg_rx->rx_message=&message; // set message pointer to get last acquisition message
 
     ASSERT_NO_THROW( {
         acquisition->set_channel(gnss_synchro.Channel_ID);
@@ -210,12 +239,9 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults)
         const char * file_name = file.c_str();
         gr::blocks::file_source::sptr file_source = gr::blocks::file_source::make(sizeof(gr_complex), file_name, false);
         top_block->connect(file_source, 0, acquisition->get_left_block(), 0);
+        top_block->msg_connect(acquisition->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events"));
     }) << "Failure connecting the blocks of acquisition test." << std::endl;
 
-    ASSERT_NO_THROW( {
-        start_queue();
-    }) << "Failure while starting the queue" << std::endl;
-
     acquisition->init();
     acquisition->reset();
     acquisition->set_state(1);
@@ -227,11 +253,10 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults)
         gettimeofday(&tv, NULL);
         end = tv.tv_sec * 1000000 + tv.tv_usec;
     }) << "Failure running the top_block." << std::endl;
-    stop_queue();
 
     unsigned long int nsamples = gnss_synchro.Acq_samplestamp_samples;
     std::cout <<  "Acquired " << nsamples << " samples in " << (end - begin) << " microseconds" << std::endl;
-    EXPECT_EQ(1, message) << "Acquisition failure. Expected message: 1=ACQ SUCCESS.";
+    ASSERT_EQ(1, *(msg_rx->rx_message)) << "Acquisition failure. Expected message: 1=ACQ SUCCESS.";
 
     std::cout << "Delay: " << gnss_synchro.Acq_delay_samples << std::endl;
     std::cout << "Doppler: " << gnss_synchro.Acq_doppler_hz << std::endl;
@@ -242,7 +267,5 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults)
 
     EXPECT_LE(doppler_error_hz, 166) << "Doppler error exceeds the expected value: 166 Hz = 2/(3*integration period)";
     EXPECT_LT(delay_error_chips, 0.175) << "Delay error exceeds the expected value: 0.175 chips";
-
-    ch_thread.join();
 }
 
diff --git a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index 6a5556b2a5..fa5582dbad 100644
--- a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -52,7 +52,7 @@
 #include "pass_through.h"
 
 #include "gnss_block_factory.h"
-
+z
 class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest: public ::testing::Test
 {
 protected:
diff --git a/src/tests/gnss_block/gnss_block_factory_test.cc b/src/tests/gnss_block/gnss_block_factory_test.cc
index 24f8f00167..e9e189530b 100644
--- a/src/tests/gnss_block/gnss_block_factory_test.cc
+++ b/src/tests/gnss_block/gnss_block_factory_test.cc
@@ -285,13 +285,13 @@ TEST(GNSS_Block_Factory_Test, InstantiateGpsL1CaTelemetryDecoder)
 TEST(GNSS_Block_Factory_Test, InstantiateChannels)
 {
     std::shared_ptr<InMemoryConfiguration> configuration = std::make_shared<InMemoryConfiguration>();
-    configuration->set_property("Channels_GPS.count", "2");
-    configuration->set_property("Channels_Galileo.count", "0");
+    configuration->set_property("Channels_1C.count", "2");
+    configuration->set_property("Channels_1E.count", "0");
     configuration->set_property("Channels.in_acquisition", "2");
-    configuration->set_property("Tracking_GPS.implementation","GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
-    configuration->set_property("TelemetryDecoder_GPS.implementation","GPS_L1_CA_Telemetry_Decoder");
+    configuration->set_property("Tracking_1C.implementation","GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
+    configuration->set_property("TelemetryDecoder_1C.implementation","GPS_L1_CA_Telemetry_Decoder");
     configuration->set_property("Channel0.item_type", "gr_complex");
-    configuration->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition");
+    configuration->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition");
     configuration->set_property("Channel1.item_type", "gr_complex");
     gr::msg_queue::sptr queue = gr::msg_queue::make(0);
     std::unique_ptr<GNSSBlockFactory> factory;
diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc
index 96cd016a20..3428b5542f 100644
--- a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc
@@ -36,6 +36,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <boost/chrono.hpp>
+#include <boost/make_shared.hpp>
 #include <gnuradio/top_block.h>
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/analog/sig_source_waveform.h>
@@ -51,17 +52,67 @@
 #include "gps_l1_ca_pcps_acquisition.h"
 
 
+
+// ######## GNURADIO BLOCK MESSAGE RECEVER #########
+class GpsL1CaPcpsAcquisitionTest_msg_rx;
+
+typedef boost::shared_ptr<GpsL1CaPcpsAcquisitionTest_msg_rx> GpsL1CaPcpsAcquisitionTest_msg_rx_sptr;
+
+GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make();
+
+class GpsL1CaPcpsAcquisitionTest_msg_rx : public gr::block
+{
+private:
+    friend GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make();
+    void msg_handler_events(pmt::pmt_t msg);
+    GpsL1CaPcpsAcquisitionTest_msg_rx();
+
+public:
+    int* rx_message;
+    ~GpsL1CaPcpsAcquisitionTest_msg_rx(); //!< Default destructor
+
+};
+
+GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make()
+{
+    return GpsL1CaPcpsAcquisitionTest_msg_rx_sptr(new GpsL1CaPcpsAcquisitionTest_msg_rx());
+}
+
+void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
+{
+    try {
+        long int message=pmt::to_long(msg);
+        *rx_message=message;
+    }catch(boost::bad_any_cast& e)
+    {
+            LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n";
+            *rx_message = 0;
+    }
+}
+
+GpsL1CaPcpsAcquisitionTest_msg_rx::GpsL1CaPcpsAcquisitionTest_msg_rx() :
+    gr::block("GpsL1CaPcpsAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
+{
+
+    this->message_port_register_in(pmt::mp("events"));
+    this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+
+}
+
+GpsL1CaPcpsAcquisitionTest_msg_rx::~GpsL1CaPcpsAcquisitionTest_msg_rx()
+{}
+
+
+// ###########################################################
+
 class GpsL1CaPcpsAcquisitionTest: public ::testing::Test
 {
 protected:
     GpsL1CaPcpsAcquisitionTest()
     {
-        //queue = gr::msg_queue::make(0);
         factory = std::make_shared<GNSSBlockFactory>();
         config = std::make_shared<InMemoryConfiguration>();
         item_size = sizeof(gr_complex);
-        stop = false;
-        message = 0;
         gnss_synchro = Gnss_Synchro();
     }
 
@@ -69,9 +120,6 @@ class GpsL1CaPcpsAcquisitionTest: public ::testing::Test
     {}
 
     void init();
-    void start_queue();
-    void wait_message();
-    void stop_queue();
 
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
@@ -79,9 +127,6 @@ class GpsL1CaPcpsAcquisitionTest: public ::testing::Test
     std::shared_ptr<InMemoryConfiguration> config;
     Gnss_Synchro gnss_synchro;
     size_t item_size;
-    bool stop;
-    int message;
-    boost::thread ch_thread;
 };
 
 
@@ -92,7 +137,7 @@ void GpsL1CaPcpsAcquisitionTest::init()
     std::string signal = "1C";
     signal.copy(gnss_synchro.Signal, 2, 0);
     gnss_synchro.PRN = 1;
-
+    queue = gr::msg_queue::make(0);
     config->set_property("GNSS-SDR.internal_fs_hz", "4000000");
     config->set_property("Acquisition.item_type", "gr_complex");
     config->set_property("Acquisition.if", "0");
@@ -107,35 +152,11 @@ void GpsL1CaPcpsAcquisitionTest::init()
 }
 
 
-void GpsL1CaPcpsAcquisitionTest::start_queue()
-{
-    ch_thread = boost::thread(&GpsL1CaPcpsAcquisitionTest::wait_message, this);
-}
-
-
-void GpsL1CaPcpsAcquisitionTest::wait_message()
-{
-    while (!stop)
-        {
-            channel_internal_queue.wait_and_pop(message);
-            stop_queue();
-        }
-}
-
-
-
-void GpsL1CaPcpsAcquisitionTest::stop_queue()
-{
-    stop = true;
-}
-
-
 
 TEST_F(GpsL1CaPcpsAcquisitionTest, Instantiate)
 {
     init();
-    queue = gr::msg_queue::make(0);
-    std::shared_ptr<GpsL1CaPcpsAcquisition> acquisition = std::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 1);
+    boost::shared_ptr<GpsL1CaPcpsAcquisition> acquisition = boost::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 1);
 }
 
 TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun)
@@ -145,11 +166,13 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun)
     struct timeval tv;
     long long int begin = 0;
     long long int end = 0;
-    top_block = gr::make_top_block("Acquisition test");
-    queue = gr::msg_queue::make(0);
+    int message=0;
 
+    top_block = gr::make_top_block("Acquisition test");
     init();
-    std::shared_ptr<GpsL1CaPcpsAcquisition> acquisition = std::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 1);
+    boost::shared_ptr<GpsL1CaPcpsAcquisition> acquisition = boost::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 1);
+    boost::shared_ptr<GpsL1CaPcpsAcquisitionTest_msg_rx> msg_rx = GpsL1CaPcpsAcquisitionTest_msg_rx_make();
+    msg_rx->rx_message=&message; // set message pointer to get last acquisition message
 
     ASSERT_NO_THROW( {
         acquisition->connect(top_block);
@@ -157,6 +180,8 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun)
         boost::shared_ptr<gr::block> valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue);
         top_block->connect(source, 0, valve, 0);
         top_block->connect(valve, 0, acquisition->get_left_block(), 0);
+        top_block->msg_connect(acquisition->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events"));
+
     }) << "Failure connecting the blocks of acquisition test." << std::endl;
 
     EXPECT_NO_THROW( {
@@ -176,14 +201,14 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults)
     long long int begin = 0;
     long long int end = 0;
     top_block = gr::make_top_block("Acquisition test");
-    queue = gr::msg_queue::make(0);
 
     double expected_delay_samples = 524;
     double expected_doppler_hz = 1680;
     init();
-    start_queue();
     std::shared_ptr<GpsL1CaPcpsAcquisition> acquisition = std::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 1);
-
+    int message=0;
+    boost::shared_ptr<GpsL1CaPcpsAcquisitionTest_msg_rx> msg_rx = GpsL1CaPcpsAcquisitionTest_msg_rx_make();
+    msg_rx->rx_message=&message; // set message pointer to get last acquisition message
 
     ASSERT_NO_THROW( {
         acquisition->set_channel(1);
@@ -216,6 +241,7 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults)
         const char * file_name = file.c_str();
         gr::blocks::file_source::sptr file_source = gr::blocks::file_source::make(sizeof(gr_complex), file_name, false);
         top_block->connect(file_source, 0, acquisition->get_left_block(), 0);
+        top_block->msg_connect(acquisition->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events"));
     }) << "Failure connecting the blocks of acquisition test." << std::endl;
 
 
@@ -230,12 +256,11 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults)
         end = tv.tv_sec * 1000000 + tv.tv_usec;
     }) << "Failure running the top_block." << std::endl;
 
-    stop_queue();
 
     unsigned long int nsamples = gnss_synchro.Acq_samplestamp_samples;
     std::cout <<  "Acquired " << nsamples << " samples in " << (end - begin) << " microseconds" << std::endl;
 
-    ASSERT_EQ(1, message) << "Acquisition failure. Expected message: 1=ACQ SUCCESS.";
+    ASSERT_EQ(1, *(msg_rx->rx_message)) << "Acquisition failure. Expected message: 1=ACQ SUCCESS.";
 
     double delay_error_samples = std::abs(expected_delay_samples - gnss_synchro.Acq_delay_samples);
     float delay_error_chips = (float)(delay_error_samples * 1023 / 4000);
@@ -244,5 +269,4 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults)
     EXPECT_LE(doppler_error_hz, 666) << "Doppler error exceeds the expected value: 666 Hz = 2/(3*integration period)";
     EXPECT_LT(delay_error_chips, 0.5) << "Delay error exceeds the expected value: 0.5 chips";
 
-    ch_thread.join();
 }
diff --git a/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc
index a340f9b114..a289aefc15 100644
--- a/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc
+++ b/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc
@@ -50,6 +50,59 @@
 #include "gps_l2_m_dll_pll_tracking.h"
 
 
+// ######## GNURADIO BLOCK MESSAGE RECEVER #########
+class GpsL2MDllPllTrackingTest_msg_rx;
+
+typedef boost::shared_ptr<GpsL2MDllPllTrackingTest_msg_rx> GpsL2MDllPllTrackingTest_msg_rx_sptr;
+
+GpsL2MDllPllTrackingTest_msg_rx_sptr GpsL2MDllPllTrackingTest_msg_rx_make();
+
+class GpsL2MDllPllTrackingTest_msg_rx : public gr::block
+{
+private:
+    friend GpsL2MDllPllTrackingTest_msg_rx_sptr GpsL2MDllPllTrackingTest_msg_rx_make();
+    void msg_handler_events(pmt::pmt_t msg);
+    GpsL2MDllPllTrackingTest_msg_rx();
+
+public:
+    int* rx_message;
+    ~GpsL2MDllPllTrackingTest_msg_rx(); //!< Default destructor
+
+};
+
+GpsL2MDllPllTrackingTest_msg_rx_sptr GpsL2MDllPllTrackingTest_msg_rx_make()
+{
+    return GpsL2MDllPllTrackingTest_msg_rx_sptr(new GpsL2MDllPllTrackingTest_msg_rx());
+}
+
+void GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
+{
+    try {
+        long int message=pmt::to_long(msg);
+        *rx_message=message;
+    }catch(boost::bad_any_cast& e)
+    {
+            LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n";
+            *rx_message = 0;
+    }
+}
+
+GpsL2MDllPllTrackingTest_msg_rx::GpsL2MDllPllTrackingTest_msg_rx() :
+    gr::block("GpsL2MDllPllTrackingTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
+{
+
+    this->message_port_register_in(pmt::mp("events"));
+    this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, _1));
+
+}
+
+GpsL2MDllPllTrackingTest_msg_rx::~GpsL2MDllPllTrackingTest_msg_rx()
+{}
+
+
+// ###########################################################
+
+
 class GpsL2MDllPllTrackingTest: public ::testing::Test
 {
 protected:
@@ -58,8 +111,6 @@ class GpsL2MDllPllTrackingTest: public ::testing::Test
         factory = std::make_shared<GNSSBlockFactory>();
         config = std::make_shared<InMemoryConfiguration>();
         item_size = sizeof(gr_complex);
-        stop = false;
-        message = 0;
         gnss_synchro = Gnss_Synchro();
     }
 
@@ -74,8 +125,6 @@ class GpsL2MDllPllTrackingTest: public ::testing::Test
     std::shared_ptr<InMemoryConfiguration> config;
     Gnss_Synchro gnss_synchro;
     size_t item_size;
-    bool stop;
-    int message;
 };
 
 
@@ -105,15 +154,17 @@ TEST_F(GpsL2MDllPllTrackingTest, ValidationOfResults)
     long long int end = 0;
     int fs_in = 5000000;
     int nsamples = fs_in*9;
+    int message=0;
+
     init();
     queue = gr::msg_queue::make(0);
     top_block = gr::make_top_block("Tracking test");
-
     std::shared_ptr<TrackingInterface> tracking = std::make_shared<GpsL2MDllPllTracking>(config.get(), "Tracking_2S", 1, 1, queue);
+    boost::shared_ptr<GpsL2MDllPllTrackingTest_msg_rx> msg_rx = GpsL2MDllPllTrackingTest_msg_rx_make();
+    msg_rx->rx_message=&message; // set message pointer to get last message
 
-    //REAL
     gnss_synchro.Acq_delay_samples = 1;
-    gnss_synchro.Acq_doppler_hz = 1200;//1200;
+    gnss_synchro.Acq_doppler_hz = 1200;
     gnss_synchro.Acq_samplestamp_samples = 0;
 
     ASSERT_NO_THROW( {
@@ -130,22 +181,16 @@ TEST_F(GpsL2MDllPllTrackingTest, ValidationOfResults)
 
     ASSERT_NO_THROW( {
         //gr::analog::sig_source_c::sptr source = gr::analog::sig_source_c::make(fs_in, gr::analog::GR_SIN_WAVE, 1000, 1, gr_complex(0));
-
-
         std::string path = std::string(TEST_PATH);
-        //std::string file = path + "signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat";
-        //std::string file = "/datalogger/signals/Fraunhofer/L125_III1b_210s_L2_resampled.bin";
         std::string file =  path + "/data/gps_l2c_m_prn7_5msps.dat";
         const char * file_name = file.c_str();
         gr::blocks::file_source::sptr file_source = gr::blocks::file_source::make(sizeof(gr_complex), file_name, false);
-
-
         boost::shared_ptr<gr::block> valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue);
         gr::blocks::null_sink::sptr sink = gr::blocks::null_sink::make(sizeof(Gnss_Synchro));
         top_block->connect(file_source, 0, valve, 0);
         top_block->connect(valve, 0, tracking->get_left_block(), 0);
         top_block->connect(tracking->get_right_block(), 0, sink, 0);
-
+        top_block->msg_connect(tracking->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events"));
     }) << "Failure connecting the blocks of tracking test." << std::endl;
 
     tracking->start_tracking();
@@ -158,6 +203,7 @@ TEST_F(GpsL2MDllPllTrackingTest, ValidationOfResults)
         end = tv.tv_sec *1000000 + tv.tv_usec;
     }) << "Failure running the top_block." << std::endl;
 
+    // TODO: Verify tracking results
     std::cout <<  "Tracked " << nsamples << " samples in " << (end - begin) << " microseconds" << std::endl;
 }
 
diff --git a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc
index 46d10ebc7a..eafaffa8cc 100644
--- a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc
+++ b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc
@@ -1,5 +1,5 @@
 /*!
- * \file gps_l1_ca_pcps_acquisition_test.cc
+ * \file gps_l2_m_pcps_acquisition_test.cc
  * \brief  This class implements an acquisition test for
  * GpsL1CaPcpsAcquisition class based on some input parameters.
  * \author Javier Arribas, 2015 (jarribas@cttc.es)
@@ -37,6 +37,7 @@
 #include <cstring>
 #include <iostream>
 #include <boost/chrono.hpp>
+#include <boost/make_shared.hpp>
 #include <gnuradio/top_block.h>
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/analog/sig_source_waveform.h>
@@ -55,17 +56,66 @@
 #include "GPS_L2C.h"
 
 
+// ######## GNURADIO BLOCK MESSAGE RECEVER #########
+class GpsL2MPcpsAcquisitionTest_msg_rx;
+
+typedef boost::shared_ptr<GpsL2MPcpsAcquisitionTest_msg_rx> GpsL2MPcpsAcquisitionTest_msg_rx_sptr;
+
+GpsL2MPcpsAcquisitionTest_msg_rx_sptr GpsL2MPcpsAcquisitionTest_msg_rx_make();
+
+class GpsL2MPcpsAcquisitionTest_msg_rx : public gr::block
+{
+private:
+    friend GpsL2MPcpsAcquisitionTest_msg_rx_sptr GpsL2MPcpsAcquisitionTest_msg_rx_make();
+    void msg_handler_events(pmt::pmt_t msg);
+    GpsL2MPcpsAcquisitionTest_msg_rx();
+
+public:
+    int* rx_message;
+    ~GpsL2MPcpsAcquisitionTest_msg_rx(); //!< Default destructor
+
+};
+
+GpsL2MPcpsAcquisitionTest_msg_rx_sptr GpsL2MPcpsAcquisitionTest_msg_rx_make()
+{
+    return GpsL2MPcpsAcquisitionTest_msg_rx_sptr(new GpsL2MPcpsAcquisitionTest_msg_rx());
+}
+
+void GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
+{
+    try {
+        long int message=pmt::to_long(msg);
+        *rx_message=message;
+    }catch(boost::bad_any_cast& e)
+    {
+            LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n";
+            *rx_message = 0;
+    }
+}
+
+GpsL2MPcpsAcquisitionTest_msg_rx::GpsL2MPcpsAcquisitionTest_msg_rx() :
+    gr::block("GpsL2MPcpsAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0))
+{
+
+    this->message_port_register_in(pmt::mp("events"));
+    this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1));
+
+}
+
+GpsL2MPcpsAcquisitionTest_msg_rx::~GpsL2MPcpsAcquisitionTest_msg_rx()
+{}
+
+
+// ###########################################################
+
 class GpsL2MPcpsAcquisitionTest: public ::testing::Test
 {
 protected:
     GpsL2MPcpsAcquisitionTest()
     {
-        //queue = gr::msg_queue::make(0);
         factory = std::make_shared<GNSSBlockFactory>();
         config = std::make_shared<InMemoryConfiguration>();
         item_size = sizeof(gr_complex);
-        stop = false;
-        message = 0;
         sampling_freqeuncy_hz = 0;
         nsamples = 0;
         gnss_synchro = Gnss_Synchro();
@@ -75,9 +125,6 @@ class GpsL2MPcpsAcquisitionTest: public ::testing::Test
     {}
 
     void init();
-    void start_queue();
-    void wait_message();
-    void stop_queue();
 
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
@@ -85,10 +132,6 @@ class GpsL2MPcpsAcquisitionTest: public ::testing::Test
     std::shared_ptr<InMemoryConfiguration> config;
     Gnss_Synchro gnss_synchro;
     size_t item_size;
-    bool stop;
-    int message;
-    boost::thread ch_thread;
-
     int sampling_freqeuncy_hz;
     int nsamples;
 };
@@ -119,30 +162,6 @@ void GpsL2MPcpsAcquisitionTest::init()
 }
 
 
-void GpsL2MPcpsAcquisitionTest::start_queue()
-{
-    ch_thread = boost::thread(&GpsL2MPcpsAcquisitionTest::wait_message, this);
-}
-
-
-void GpsL2MPcpsAcquisitionTest::wait_message()
-{
-    while (!stop)
-        {
-            channel_internal_queue.wait_and_pop(message);
-            stop_queue();
-        }
-}
-
-
-
-void GpsL2MPcpsAcquisitionTest::stop_queue()
-{
-    stop = true;
-}
-
-
-
 TEST_F(GpsL2MPcpsAcquisitionTest, Instantiate)
 {
     init();
@@ -155,6 +174,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ConnectAndRun)
     struct timeval tv;
     long long int begin = 0;
     long long int end = 0;
+    int message=0;
     top_block = gr::make_top_block("Acquisition test");
     queue = gr::msg_queue::make(0);
 
@@ -167,6 +187,8 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ConnectAndRun)
         boost::shared_ptr<gr::block> valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue);
         top_block->connect(source, 0, valve, 0);
         top_block->connect(valve, 0, acquisition->get_left_block(), 0);
+        boost::shared_ptr<GpsL2MPcpsAcquisitionTest_msg_rx> msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make();
+        msg_rx->rx_message=&message; // set message pointer to get last acquisition message
     }) << "Failure connecting the blocks of acquisition test." << std::endl;
 
     EXPECT_NO_THROW( {
@@ -185,16 +207,15 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults)
     struct timeval tv;
     long long int begin = 0;
     long long int end = 0;
+    int message=0;
     top_block = gr::make_top_block("Acquisition test");
     queue = gr::msg_queue::make(0);
-
-
     double expected_delay_samples = 1;//2004;
     double expected_doppler_hz = 1200;//3000;
     init();
-    start_queue();
     std::shared_ptr<GpsL2MPcpsAcquisition> acquisition = std::make_shared<GpsL2MPcpsAcquisition>(config.get(), "Acquisition", 1, 1);
-
+    boost::shared_ptr<GpsL2MPcpsAcquisitionTest_msg_rx> msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make();
+    msg_rx->rx_message=&message; // set message pointer to get last acquisition message
 
     ASSERT_NO_THROW( {
         acquisition->set_channel(1);
@@ -230,12 +251,11 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults)
         //gr::blocks::interleaved_short_to_complex::sptr gr_interleaved_short_to_complex_ = gr::blocks::interleaved_short_to_complex::make();
         //gr::blocks::char_to_short::sptr gr_char_to_short_ = gr::blocks::char_to_short::make();
         boost::shared_ptr<gr::block> valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue);
-
         //top_block->connect(file_source, 0, gr_char_to_short_, 0);
     	//top_block->connect(gr_char_to_short_, 0, gr_interleaved_short_to_complex_ , 0);
     	top_block->connect(file_source, 0, valve , 0);
         top_block->connect(valve, 0, acquisition->get_left_block(), 0);
-
+        top_block->msg_connect(acquisition->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events"));
     }) << "Failure connecting the blocks of acquisition test." << std::endl;
 
 
@@ -252,16 +272,13 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults)
         end = tv.tv_sec * 1000000 + tv.tv_usec;
     }) << "Failure running the top_block." << std::endl;
 
-    stop_queue();
-
     //unsigned long int Acq_samplestamp_samples = gnss_synchro.Acq_samplestamp_samples;
     std::cout <<  "Acquisition process runtime duration: " << (end - begin) << " microseconds" << std::endl;
 
     std::cout <<  "gnss_synchro.Acq_doppler_hz = " << gnss_synchro.Acq_doppler_hz << " Hz" << std::endl;
     std::cout <<  "gnss_synchro.Acq_delay_samples = " << gnss_synchro.Acq_delay_samples << " Samples" << std::endl;
 
-
-    ASSERT_EQ(1, message) << "Acquisition failure. Expected message: 1=ACQ SUCCESS.";
+    ASSERT_EQ(1, *(msg_rx->rx_message)) << "Acquisition failure. Expected message: 1=ACQ SUCCESS.";
 
     double delay_error_samples = std::abs(expected_delay_samples - gnss_synchro.Acq_delay_samples);
     float delay_error_chips = (float)(delay_error_samples * 1023 / 4000);
@@ -270,5 +287,4 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults)
     EXPECT_LE(doppler_error_hz, 200) << "Doppler error exceeds the expected value: 666 Hz = 2/(3*integration period)";
     EXPECT_LT(delay_error_chips, 0.5) << "Delay error exceeds the expected value: 0.5 chips";
 
-    ch_thread.join();
 }
diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc
index a9e63f93fa..2df342e537 100644
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@ -34,6 +34,7 @@
 #include <queue>
 #include <memory>
 #include <boost/thread.hpp>
+#include <boost/make_shared.hpp>
 #include <boost/filesystem.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
@@ -86,8 +87,8 @@ DECLARE_string(log_dir);
 #include "gnss_block/rtcm_printer_test.cc"
 #include "gnss_block/file_signal_source_test.cc"
 #include "gnss_block/fir_filter_test.cc"
-//#include "gnss_block/gps_l1_ca_pcps_acquisition_test.cc"
-//#include "gnss_block/gps_l2_m_pcps_acquisition_test.cc"
+#include "gnss_block/gps_l1_ca_pcps_acquisition_test.cc"
+#include "gnss_block/gps_l2_m_pcps_acquisition_test.cc"
 //#include "gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc"
 //#include "gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc"
 //#if OPENCL_BLOCKS_TEST
@@ -95,7 +96,7 @@ DECLARE_string(log_dir);
 //#endif
 //#include "gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc"
 //#include "gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc"
-//#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc"
+#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc"
 //#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc"
 //#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc"
 //#include "gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc"
@@ -106,8 +107,6 @@ DECLARE_string(log_dir);
 #include "gnuradio_block/gnss_sdr_valve_test.cc"
 #include "gnuradio_block/direct_resampler_conditioner_cc_test.cc"
 
-//#include "gnss_block/galileo_e5a_pcps_acquisition_test.cc"
-//#include "gnss_block/galileo_e5a_pcps_acquisition_test_2.cc"
 //#include "gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc"
 #include "gnss_block/galileo_e5a_tracking_test.cc"
 #include "gnss_block/gps_l2_m_dll_pll_tracking_test.cc"