diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index e63c01736..9aa8f0388 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -700,31 +700,40 @@ else(NOT ${GTEST_DIR_LOCAL})
     add_dependencies(gnuradio_block_test gtest)
 endif(NOT ${GTEST_DIR_LOCAL})
 
-# add_executable(acq_test ${EXCLUDE}
-#      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-#      ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/gps_l1_ca_pcps_acquisition_test.cc
-#      ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc
-# )
-# target_link_libraries(acq_test ${Boost_LIBRARIES}
-#                                ${GFlags_LIBS}
-#                                ${GLOG_LIBRARIES}
-#                                ${GTEST_LIBRARIES}
-#                                ${GNURADIO_RUNTIME_LIBRARIES}
-#                                ${GNURADIO_BLOCKS_LIBRARIES}
-#                                ${GNURADIO_FILTER_LIBRARIES}
-#                                ${GNURADIO_ANALOG_LIBRARIES}
-#                                gnss_sp_libs
-#                                gnss_rx
-#                                gnss_system_parameters
-#                                signal_generator_blocks
-#                                ${VOLK_GNSSSDR_LIBRARIES}
-#                                )
-# add_test(acq_test acq_test)
+add_executable(acq_test
+      ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+      ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+ )
+target_link_libraries(acq_test ${Boost_LIBRARIES}
+                                ${GFlags_LIBS}
+                                ${GLOG_LIBRARIES}
+                                ${GTEST_LIBRARIES}
+                                ${GNURADIO_RUNTIME_LIBRARIES}
+                                ${GNURADIO_BLOCKS_LIBRARIES}
+                                ${GNURADIO_FILTER_LIBRARIES}
+                                ${GNURADIO_ANALOG_LIBRARIES}
+                                gnss_sp_libs
+                                gnss_rx
+                                gnss_system_parameters
+                                signal_generator_blocks
+                                signal_processing_testing_lib
+                                ${VOLK_GNSSSDR_LIBRARIES}
+                                )
+add_test(acq_test acq_test)
+if(NOT ${GTEST_DIR_LOCAL})
+    add_dependencies(acq_test acq_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
+else(NOT ${GTEST_DIR_LOCAL})
+    add_dependencies(acq_test acq_test gtest)
+endif(NOT ${GTEST_DIR_LOCAL})
+
+
 
 add_executable(trk_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
                         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc
                         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc
+                        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
               )
+
 target_link_libraries(trk_test ${Boost_LIBRARIES}
                                ${GFlags_LIBS}
                                ${GLOG_LIBRARIES}
@@ -747,9 +756,5 @@ else(NOT ${GTEST_DIR_LOCAL})
 endif(NOT ${GTEST_DIR_LOCAL})
 
 
-if(${ENABLE_PACKAGING})
-     add_dependencies(check gnuradio_block_test trk_test)
-else(${ENABLE_PACKAGING})
-     add_dependencies(check control_thread_test flowgraph_test gnss_block_test
-                      gnuradio_block_test trk_test)
-endif(${ENABLE_PACKAGING})
+add_dependencies(check control_thread_test flowgraph_test gnss_block_test
+                       gnuradio_block_test acq_test trk_test)
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
index e0b146fd6..4502358d2 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
@@ -34,6 +34,7 @@
 #include <chrono>
 #include <iostream>
 #include <boost/make_shared.hpp>
+#include <glog/logging.h>
 #include <gnuradio/top_block.h>
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/analog/sig_source_waveform.h>
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
index fa1d5dc60..4ce6722c5 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
@@ -457,7 +457,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ConnectAndRun)
         start = std::chrono::system_clock::now();
         top_block->run(); // Start threads and wait
         end = std::chrono::system_clock::now();
-        std::chrono::duration<double> elapsed_seconds = end - start;
+        elapsed_seconds = end - start;
     }) << "Failure running the top_block.";
 
     std::cout <<  "Processed " << nsamples << " samples in " << elapsed_seconds.count() * 1e6 << " microseconds" << std::endl;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
index a432cec1a..1ddd637a7 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
@@ -36,6 +36,7 @@
 #include <iostream>
 #include <boost/filesystem.hpp>
 #include <boost/make_shared.hpp>
+#include <glog/logging.h>
 #include <gnuradio/top_block.h>
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/analog/sig_source_waveform.h>
@@ -49,6 +50,7 @@
 #include "gnss_sdr_valve.h"
 #include "gnss_synchro.h"
 #include "gnuplot_i.h"
+#include "GPS_L1_CA.h"
 #include "test_flags.h"
 #include "acquisition_dump_reader.h"
 #include "gps_l1_ca_pcps_acquisition.h"