diff --git a/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml b/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml
index 0c5dcbc4d..13bd6e799 100644
--- a/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml
+++ b/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
-<!-- SPDX-FileCopyrightText: 2018 Javier Arribas <javier.arribas@cttc.es> -->
 <!DOCTYPE boost_serialization>
 <boost_serialization signature="serialization::archive" version="12">
 <GNSS-SDR_ephemeris_map class_id="0" tracking_level="0" version="0">
@@ -9,474 +7,496 @@
 	<item class_id="1" tracking_level="0" version="0">
 		<first>1</first>
 		<second class_id="2" tracking_level="0" version="0">
-			<i_satellite_PRN>1</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>9.20000000000000000e+01</d_IODE_SF2>
-			<d_IODE_SF3>9.20000000000000000e+01</d_IODE_SF3>
-			<d_Crs>1.83125000000000000e+01</d_Crs>
-			<d_Delta_n>4.86413118201646669e-09</d_Delta_n>
-			<d_M_0>2.06468198930943725e+00</d_M_0>
-			<d_Cuc>9.42498445510864258e-07</d_Cuc>
-			<d_e_eccentricity>3.73082922305911736e-03</d_e_eccentricity>
-			<d_Cus>5.76488673686981201e-06</d_Cus>
-			<d_sqrt_A>5.15366174697875977e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>-5.40167093276977539e-08</d_Cic>
-			<d_OMEGA0>9.52167247599200905e-01</d_OMEGA0>
-			<d_Cis>1.86264514923095703e-08</d_Cis>
-			<d_i_0>9.61377026423456127e-01</d_i_0>
-			<d_Crc>2.66968750000000000e+02</d_Crc>
-			<d_OMEGA>4.44935333708291858e-01</d_OMEGA>
-			<d_OMEGA_DOT>-8.14641075927847669e-09</d_OMEGA_DOT>
-			<d_IDOT>4.15017287135849497e-10</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>5.12227416038513184e-09</d_TGD>
-			<d_IODC>9.20000000000000000e+01</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>-1.09937973320484161e-05</d_A_f0>
-			<d_A_f1>3.41060513164847988e-13</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>1</PRN>
+			<M_0>2.06468198930943725e+00</M_0>
+			<delta_n>4.86413118201646669e-09</delta_n>
+			<ecc>3.73082922305911736e-03</ecc>
+			<sqrtA>5.15366174697875977e+03</sqrtA>
+			<OMEGA_0>9.52167247599200905e-01</OMEGA_0>
+			<i_0>9.61377026423456127e-01</i_0>
+			<omega>4.44935333708291858e-01</omega>
+			<OMEGAdot>-8.14641075927847669e-09</OMEGAdot>
+			<idot>4.15017287135849497e-10</idot>
+			<Cuc>9.42498445510864258e-07</Cuc>
+			<Cus>5.76488673686981201e-06</Cus>
+			<Crc>2.66968750000000000e+02</Crc>
+			<Crs>1.83125000000000000e+01</Crs>
+			<Cic>-5.40167093276977539e-08</Cic>
+			<Cis>1.86264514923095703e-08</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>-1.09937973320484161e-05</af0>
+			<af1>3.41060513164847988e-13</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>92</IODE_SF2>
+			<IODE_SF3>92</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>5.12227416038513184e-09</TGD>
+			<IODC>92</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 	<item>
 		<first>2</first>
 		<second>
-			<i_satellite_PRN>2</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>5.50000000000000000e+01</d_IODE_SF2>
-			<d_IODE_SF3>5.50000000000000000e+01</d_IODE_SF3>
-			<d_Crs>2.22812500000000000e+01</d_Crs>
-			<d_Delta_n>5.12771358985317661e-09</d_Delta_n>
-			<d_M_0>2.75926302782053146e+00</d_M_0>
-			<d_Cuc>1.10082328319549561e-06</d_Cuc>
-			<d_e_eccentricity>1.40569622162729484e-02</d_e_eccentricity>
-			<d_Cus>6.26407563686370850e-06</d_Cus>
-			<d_sqrt_A>5.15372654151916504e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>-1.86264514923095703e-08</d_Cic>
-			<d_OMEGA0>9.18037446344556307e-01</d_OMEGA0>
-			<d_Cis>-2.16066837310791016e-07</d_Cis>
-			<d_i_0>9.39991586696909520e-01</d_i_0>
-			<d_Crc>2.45468750000000000e+02</d_Crc>
-			<d_OMEGA>-2.35598690357981555e+00</d_OMEGA>
-			<d_OMEGA_DOT>-8.07140763509730069e-09</d_OMEGA_DOT>
-			<d_IDOT>5.25736184736635464e-10</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>-2.00234353542327881e-08</d_TGD>
-			<d_IODC>5.50000000000000000e+01</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>5.36850653588771820e-04</d_A_f0>
-			<d_A_f1>2.16004991671070416e-12</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>2</PRN>
+			<M_0>2.75926302782053146e+00</M_0>
+			<delta_n>5.12771358985317661e-09</delta_n>
+			<ecc>1.40569622162729484e-02</ecc>
+			<sqrtA>5.15372654151916504e+03</sqrtA>
+			<OMEGA_0>9.18037446344556307e-01</OMEGA_0>
+			<i_0>9.39991586696909520e-01</i_0>
+			<omega>-2.35598690357981555e+00</omega>
+			<OMEGAdot>-8.07140763509730069e-09</OMEGAdot>
+			<idot>5.25736184736635464e-10</idot>
+			<Cuc>1.10082328319549561e-06</Cuc>
+			<Cus>6.26407563686370850e-06</Cus>
+			<Crc>2.45468750000000000e+02</Crc>
+			<Crs>2.22812500000000000e+01</Crs>
+			<Cic>-1.86264514923095703e-08</Cic>
+			<Cis>-2.16066837310791016e-07</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>5.36850653588771820e-04</af0>
+			<af1>2.16004991671070416e-12</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>55</IODE_SF2>
+			<IODE_SF3>55</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>-2.00234353542327881e-08</TGD>
+			<IODC>55</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 	<item>
 		<first>3</first>
 		<second>
-			<i_satellite_PRN>3</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>7.00000000000000000e+01</d_IODE_SF2>
-			<d_IODE_SF3>7.00000000000000000e+01</d_IODE_SF3>
-			<d_Crs>-2.04375000000000000e+01</d_Crs>
-			<d_Delta_n>4.75769817722603366e-09</d_Delta_n>
-			<d_M_0>-1.78871492992227910e+00</d_M_0>
-			<d_Cuc>-1.30012631416320801e-06</d_Cuc>
-			<d_e_eccentricity>9.70319728367030512e-04</d_e_eccentricity>
-			<d_Cus>8.26455652713775635e-06</d_Cus>
-			<d_sqrt_A>5.15378153991699219e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>7.82310962677001953e-08</d_Cic>
-			<d_OMEGA0>1.99297660614955263e+00</d_OMEGA0>
-			<d_Cis>-1.11758708953857422e-08</d_Cis>
-			<d_i_0>9.59058451948379909e-01</d_i_0>
-			<d_Crc>2.19593750000000000e+02</d_Crc>
-			<d_OMEGA>-3.00536842405812843e+00</d_OMEGA>
-			<d_OMEGA_DOT>-8.02712007605698577e-09</d_OMEGA_DOT>
-			<d_IDOT>-5.17164399115929480e-10</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>5.12227416038513184e-09</d_TGD>
-			<d_IODC>7.00000000000000000e+01</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>8.80691222846508026e-05</d_A_f0>
-			<d_A_f1>2.89901436190120811e-11</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>3</PRN>
+			<M_0>-1.78871492992227910e+00</M_0>
+			<delta_n>4.75769817722603366e-09</delta_n>
+			<ecc>9.70319728367030512e-04</ecc>
+			<sqrtA>5.15378153991699219e+03</sqrtA>
+			<OMEGA_0>1.99297660614955263e+00</OMEGA_0>
+			<i_0>9.59058451948379909e-01</i_0>
+			<omega>-3.00536842405812843e+00</omega>
+			<OMEGAdot>-8.02712007605698577e-09</OMEGAdot>
+			<idot>-5.17164399115929480e-10</idot>
+			<Cuc>-1.30012631416320801e-06</Cuc>
+			<Cus>8.26455652713775635e-06</Cus>
+			<Crc>2.19593750000000000e+02</Crc>
+			<Crs>-2.04375000000000000e+01</Crs>
+			<Cic>7.82310962677001953e-08</Cic>
+			<Cis>-1.11758708953857422e-08</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>8.80691222846508026e-05</af0>
+			<af1>2.89901436190120811e-11</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>70</IODE_SF2>
+			<IODE_SF3>70</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>5.12227416038513184e-09</TGD>
+			<IODC>70</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 	<item>
 		<first>6</first>
 		<second>
-			<i_satellite_PRN>6</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>2.30000000000000000e+01</d_IODE_SF2>
-			<d_IODE_SF3>2.30000000000000000e+01</d_IODE_SF3>
-			<d_Crs>1.63750000000000000e+01</d_Crs>
-			<d_Delta_n>4.76305554323897445e-09</d_Delta_n>
-			<d_M_0>-1.28531071631616522e+00</d_M_0>
-			<d_Cuc>9.12696123123168945e-07</d_Cuc>
-			<d_e_eccentricity>5.50022465176880251e-04</d_e_eccentricity>
-			<d_Cus>6.24358654022216797e-06</d_Cus>
-			<d_sqrt_A>5.15365166282653809e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>-1.30385160446166992e-08</d_Cic>
-			<d_OMEGA0>9.43624288779246867e-01</d_OMEGA0>
-			<d_Cis>-1.86264514923095703e-09</d_Cis>
-			<d_i_0>9.61292940818096020e-01</d_i_0>
-			<d_Crc>2.58406250000000000e+02</d_Crc>
-			<d_OMEGA>2.29191014519991665e+00</d_OMEGA>
-			<d_OMEGA_DOT>-8.08069373618639861e-09</d_OMEGA_DOT>
-			<d_IDOT>4.79305679291144535e-10</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>4.65661287307739258e-09</d_TGD>
-			<d_IODC>2.30000000000000000e+01</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>3.07881273329257965e-05</d_A_f0>
-			<d_A_f1>8.18545231595635253e-12</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>6</PRN>
+			<M_0>-1.28531071631616522e+00</M_0>
+			<delta_n>4.76305554323897445e-09</delta_n>
+			<ecc>5.50022465176880251e-04</ecc>
+			<sqrtA>5.15365166282653809e+03</sqrtA>
+			<OMEGA_0>9.43624288779246867e-01</OMEGA_0>
+			<i_0>9.61292940818096020e-01</i_0>
+			<omega>2.29191014519991665e+00</omega>
+			<OMEGAdot>-8.08069373618639861e-09</OMEGAdot>
+			<idot>4.79305679291144535e-10</idot>
+			<Cuc>9.12696123123168945e-07</Cuc>
+			<Cus>6.24358654022216797e-06</Cus>
+			<Crc>2.58406250000000000e+02</Crc>
+			<Crs>1.63750000000000000e+01</Crs>
+			<Cic>-1.30385160446166992e-08</Cic>
+			<Cis>-1.86264514923095703e-09</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>3.07881273329257965e-05</af0>
+			<af1>8.18545231595635253e-12</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>23</IODE_SF2>
+			<IODE_SF3>23</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>4.65661287307739258e-09</TGD>
+			<IODC>23</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 	<item>
 		<first>9</first>
 		<second>
-			<i_satellite_PRN>9</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>4.70000000000000000e+01</d_IODE_SF2>
-			<d_IODE_SF3>4.70000000000000000e+01</d_IODE_SF3>
-			<d_Crs>1.12906250000000000e+02</d_Crs>
-			<d_Delta_n>4.37911097897818463e-09</d_Delta_n>
-			<d_M_0>-2.75253879947800195e+00</d_M_0>
-			<d_Cuc>5.85243105888366699e-06</d_Cuc>
-			<d_e_eccentricity>2.16206186451017829e-04</d_e_eccentricity>
-			<d_Cus>1.16303563117980957e-05</d_Cus>
-			<d_sqrt_A>5.15369471168518066e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>1.67638063430786133e-08</d_Cic>
-			<d_OMEGA0>3.03742251571970812e+00</d_OMEGA0>
-			<d_Cis>-1.11758708953857422e-08</d_Cis>
-			<d_i_0>9.59160503650671514e-01</d_i_0>
-			<d_Crc>1.56125000000000000e+02</d_Crc>
-			<d_OMEGA>2.60662251530764344e+00</d_OMEGA>
-			<d_OMEGA_DOT>-7.85854162551643464e-09</d_OMEGA_DOT>
-			<d_IDOT>-3.46443002170201364e-11</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>4.65661287307739258e-10</d_TGD>
-			<d_IODC>4.70000000000000000e+01</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>-3.18535603582859039e-05</d_A_f0>
-			<d_A_f1>-9.66338120633736091e-12</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>9</PRN>
+			<M_0>-2.75253879947800195e+00</M_0>
+			<delta_n>4.37911097897818463e-09</delta_n>
+			<ecc>2.16206186451017829e-04</ecc>
+			<sqrtA>5.15369471168518066e+03</sqrtA>
+			<OMEGA_0>3.03742251571970812e+00</OMEGA_0>
+			<i_0>9.59160503650671514e-01</i_0>
+			<omega>2.60662251530764344e+00</omega>
+			<OMEGAdot>-7.85854162551643464e-09</OMEGAdot>
+			<idot>-3.46443002170201364e-11</idot>
+			<Cuc>5.85243105888366699e-06</Cuc>
+			<Cus>1.16303563117980957e-05</Cus>
+			<Crc>1.56125000000000000e+02</Crc>
+			<Crs>1.12906250000000000e+02</Crs>
+			<Cic>1.67638063430786133e-08</Cic>
+			<Cis>-1.11758708953857422e-08</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>-3.18535603582859039e-05</af0>
+			<af1>-9.66338120633736091e-12</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>47</IODE_SF2>
+			<IODE_SF3>47</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>4.65661287307739258e-10</TGD>
+			<IODC>47</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 	<item>
 		<first>10</first>
 		<second>
-			<i_satellite_PRN>10</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>5.80000000000000000e+01</d_IODE_SF2>
-			<d_IODE_SF3>5.80000000000000000e+01</d_IODE_SF3>
-			<d_Crs>-2.72500000000000000e+01</d_Crs>
-			<d_Delta_n>5.27093384126580581e-09</d_Delta_n>
-			<d_M_0>-8.86982818851813737e-01</d_M_0>
-			<d_Cuc>-1.17719173431396484e-06</d_Cuc>
-			<d_e_eccentricity>1.44534236751496774e-02</d_e_eccentricity>
-			<d_Cus>7.90506601333618164e-06</d_Cus>
-			<d_sqrt_A>5.15363725471496582e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>1.45286321640014648e-07</d_Cic>
-			<d_OMEGA0>2.00408517949479270e+00</d_OMEGA0>
-			<d_Cis>2.40281224250793457e-07</d_Cis>
-			<d_i_0>9.41160112993577269e-01</d_i_0>
-			<d_Crc>2.15406250000000000e+02</d_Crc>
-			<d_OMEGA>9.09732121011562200e-01</d_OMEGA>
-			<d_OMEGA_DOT>-8.42213653007785350e-09</d_OMEGA_DOT>
-			<d_IDOT>-5.42879755978047536e-10</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>-2.79396772384643555e-09</d_TGD>
-			<d_IODC>5.80000000000000000e+01</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>-1.54968351125717163e-04</d_A_f0>
-			<d_A_f1>-1.59161572810262401e-12</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>10</PRN>
+			<M_0>-8.86982818851813737e-01</M_0>
+			<delta_n>5.27093384126580581e-09</delta_n>
+			<ecc>1.44534236751496774e-02</ecc>
+			<sqrtA>5.15363725471496582e+03</sqrtA>
+			<OMEGA_0>2.00408517949479270e+00</OMEGA_0>
+			<i_0>9.41160112993577269e-01</i_0>
+			<omega>9.09732121011562200e-01</omega>
+			<OMEGAdot>-8.42213653007785350e-09</OMEGAdot>
+			<idot>-5.42879755978047536e-10</idot>
+			<Cuc>-1.17719173431396484e-06</Cuc>
+			<Cus>7.90506601333618164e-06</Cus>
+			<Crc>2.15406250000000000e+02</Crc>
+			<Crs>-2.72500000000000000e+01</Crs>
+			<Cic>1.45286321640014648e-07</Cic>
+			<Cis>2.40281224250793457e-07</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>-1.54968351125717163e-04</af0>
+			<af1>-1.59161572810262401e-12</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>58</IODE_SF2>
+			<IODE_SF3>58</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>-2.79396772384643555e-09</TGD>
+			<IODC>58</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 	<item>
 		<first>12</first>
 		<second>
-			<i_satellite_PRN>12</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>1.06000000000000000e+02</d_IODE_SF2>
-			<d_IODE_SF3>1.06000000000000000e+02</d_IODE_SF3>
-			<d_Crs>-1.17468750000000000e+02</d_Crs>
-			<d_Delta_n>3.94516433192994276e-09</d_Delta_n>
-			<d_M_0>1.11631735294997192e+00</d_M_0>
-			<d_Cuc>-6.15417957305908203e-06</d_Cuc>
-			<d_e_eccentricity>5.05860964767634782e-03</d_e_eccentricity>
-			<d_Cus>4.52436506748199463e-06</d_Cus>
-			<d_sqrt_A>5.15376680946350098e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>-5.40167093276977539e-08</d_Cic>
-			<d_OMEGA0>-1.10425023618040785e+00</d_OMEGA0>
-			<d_Cis>4.09781932830810547e-08</d_Cis>
-			<d_i_0>9.88803748742243305e-01</d_i_0>
-			<d_Crc>3.07187500000000000e+02</d_Crc>
-			<d_OMEGA>5.00154452274795935e-01</d_OMEGA>
-			<d_OMEGA_DOT>-7.97176062725659211e-09</d_OMEGA_DOT>
-			<d_IDOT>-4.18231706743614228e-10</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>-1.16415321826934814e-08</d_TGD>
-			<d_IODC>1.06000000000000000e+02</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>2.54871323704719543e-04</d_A_f0>
-			<d_A_f1>2.72848410531878391e-12</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>12</PRN>
+			<M_0>1.11631735294997192e+00</M_0>
+			<delta_n>3.94516433192994276e-09</delta_n>
+			<ecc>5.05860964767634782e-03</ecc>
+			<sqrtA>5.15376680946350098e+03</sqrtA>
+			<OMEGA_0>-1.10425023618040785e+00</OMEGA_0>
+			<i_0>9.88803748742243305e-01</i_0>
+			<omega>5.00154452274795935e-01</omega>
+			<OMEGAdot>-7.97176062725659211e-09</OMEGAdot>
+			<idot>-4.18231706743614228e-10</idot>
+			<Cuc>-6.15417957305908203e-06</Cuc>
+			<Cus>4.52436506748199463e-06</Cus>
+			<Crc>3.07187500000000000e+02</Crc>
+			<Crs>-1.17468750000000000e+02</Crs>
+			<Cic>-5.40167093276977539e-08</Cic>
+			<Cis>4.09781932830810547e-08</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>2.54871323704719543e-04</af0>
+			<af1>2.72848410531878391e-12</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>106</IODE_SF2>
+			<IODE_SF3>106</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>-1.16415321826934814e-08</TGD>
+			<IODC>106</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 	<item>
 		<first>17</first>
 		<second>
-			<i_satellite_PRN>17</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>2.60000000000000000e+01</d_IODE_SF2>
-			<d_IODE_SF3>2.60000000000000000e+01</d_IODE_SF3>
-			<d_Crs>-5.91250000000000000e+01</d_Crs>
-			<d_Delta_n>3.88194741297723567e-09</d_Delta_n>
-			<d_M_0>-1.94252959218893162e+00</d_M_0>
-			<d_Cuc>-3.04728746414184570e-06</d_Cuc>
-			<d_e_eccentricity>9.88844956737011498e-03</d_e_eccentricity>
-			<d_Cus>1.18296593427658081e-05</d_Cus>
-			<d_sqrt_A>5.15369299888610840e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>2.03028321266174316e-07</d_Cic>
-			<d_OMEGA0>-5.68690999805671268e-02</d_OMEGA0>
-			<d_Cis>-7.63684511184692383e-08</d_Cis>
-			<d_i_0>9.71201777972365177e-01</d_i_0>
-			<d_Crc>1.56531250000000000e+02</d_Crc>
-			<d_OMEGA>-2.06928329237789344e+00</d_OMEGA>
-			<d_OMEGA_DOT>-7.44602444251995675e-09</d_OMEGA_DOT>
-			<d_IDOT>4.40375486263771432e-10</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>-1.07102096080780029e-08</d_TGD>
-			<d_IODC>2.60000000000000000e+01</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>-1.44933816045522690e-04</d_A_f0>
-			<d_A_f1>-2.27373675443232019e-12</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>17</PRN>
+			<M_0>-1.94252959218893162e+00</M_0>
+			<delta_n>3.88194741297723567e-09</delta_n>
+			<ecc>9.88844956737011498e-03</ecc>
+			<sqrtA>5.15369299888610840e+03</sqrtA>
+			<OMEGA_0>-5.68690999805671268e-02</OMEGA_0>
+			<i_0>9.71201777972365177e-01</i_0>
+			<omega>-2.06928329237789344e+00</omega>
+			<OMEGAdot>-7.44602444251995675e-09</OMEGAdot>
+			<idot>4.40375486263771432e-10</idot>
+			<Cuc>-3.04728746414184570e-06</Cuc>
+			<Cus>1.18296593427658081e-05</Cus>
+			<Crc>1.56531250000000000e+02</Crc>
+			<Crs>-5.91250000000000000e+01</Crs>
+			<Cic>2.03028321266174316e-07</Cic>
+			<Cis>-7.63684511184692383e-08</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>-1.44933816045522690e-04</af0>
+			<af1>-2.27373675443232019e-12</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>26</IODE_SF2>
+			<IODE_SF3>26</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>-1.07102096080780029e-08</TGD>
+			<IODC>26</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 	<item>
 		<first>20</first>
 		<second>
-			<i_satellite_PRN>20</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>1.17000000000000000e+02</d_IODE_SF2>
-			<d_IODE_SF3>1.17000000000000000e+02</d_IODE_SF3>
-			<d_Crs>-2.58437500000000000e+01</d_Crs>
-			<d_Delta_n>5.60380484953655626e-09</d_Delta_n>
-			<d_M_0>1.28625710142833249e-01</d_M_0>
-			<d_Cuc>-1.52923166751861572e-06</d_Cuc>
-			<d_e_eccentricity>5.80669869668781671e-03</d_e_eccentricity>
-			<d_Cus>7.51018524169921875e-06</d_Cus>
-			<d_sqrt_A>5.15578671264648438e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>-2.23517417907714844e-08</d_Cic>
-			<d_OMEGA0>1.92543994118208528e+00</d_OMEGA0>
-			<d_Cis>4.65661287307739258e-08</d_Cis>
-			<d_i_0>9.26021286652122910e-01</d_i_0>
-			<d_Crc>2.18031250000000000e+02</d_Crc>
-			<d_OMEGA>1.23365536128043107e+00</d_OMEGA>
-			<d_OMEGA_DOT>-8.54892752571746483e-09</d_OMEGA_DOT>
-			<d_IDOT>-5.16450083647537340e-10</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>-8.38190317153930664e-09</d_TGD>
-			<d_IODC>1.17000000000000000e+02</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>2.69209500402212143e-04</d_A_f0>
-			<d_A_f1>4.20641299569979229e-12</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>20</PRN>
+			<M_0>1.28625710142833249e-01</M_0>
+			<delta_n>5.60380484953655626e-09</delta_n>
+			<ecc>5.80669869668781671e-03</ecc>
+			<sqrtA>5.15578671264648438e+03</sqrtA>
+			<OMEGA_0>1.92543994118208528e+00</OMEGA_0>
+			<i_0>9.26021286652122910e-01</i_0>
+			<omega>1.23365536128043107e+00</omega>
+			<OMEGAdot>-8.54892752571746483e-09</OMEGAdot>
+			<idot>-5.16450083647537340e-10</idot>
+			<Cuc>-1.52923166751861572e-06</Cuc>
+			<Cus>7.51018524169921875e-06</Cus>
+			<Crc>2.18031250000000000e+02</Crc>
+			<Crs>-2.58437500000000000e+01</Crs>
+			<Cic>-2.23517417907714844e-08</Cic>
+			<Cis>4.65661287307739258e-08</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>2.69209500402212143e-04</af0>
+			<af1>4.20641299569979229e-12</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>117</IODE_SF2>
+			<IODE_SF3>117</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>-8.38190317153930664e-09</TGD>
+			<IODC>117</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 	<item>
 		<first>23</first>
 		<second>
-			<i_satellite_PRN>23</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>4.10000000000000000e+01</d_IODE_SF2>
-			<d_IODE_SF3>4.10000000000000000e+01</d_IODE_SF3>
-			<d_Crs>1.20250000000000000e+02</d_Crs>
-			<d_Delta_n>4.45161399901998963e-09</d_Delta_n>
-			<d_M_0>3.04794581942897569e+00</d_M_0>
-			<d_Cuc>6.13741576671600342e-06</d_Cuc>
-			<d_e_eccentricity>9.67817602213471954e-03</d_e_eccentricity>
-			<d_Cus>1.14180147647857666e-05</d_Cus>
-			<d_sqrt_A>5.15370163154602051e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>-6.14672899246215820e-08</d_Cic>
-			<d_OMEGA0>3.04748172476042711e+00</d_OMEGA0>
-			<d_Cis>-1.04308128356933594e-07</d_Cis>
-			<d_i_0>9.50229191282804808e-01</d_i_0>
-			<d_Crc>1.56000000000000000e+02</d_Crc>
-			<d_OMEGA>-2.71676891930177256e+00</d_OMEGA>
-			<d_OMEGA_DOT>-7.78032408172749087e-09</d_OMEGA_DOT>
-			<d_IDOT>-2.75011455330984601e-11</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>-1.95577740669250488e-08</d_TGD>
-			<d_IODC>4.10000000000000000e+01</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>-7.56788067519664764e-05</d_A_f0>
-			<d_A_f1>-2.72848410531878391e-12</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>23</PRN>
+			<M_0>3.04794581942897569e+00</M_0>
+			<delta_n>4.45161399901998963e-09</delta_n>
+			<ecc>9.67817602213471954e-03</ecc>
+			<sqrtA>5.15370163154602051e+03</sqrtA>
+			<OMEGA_0>3.04748172476042711e+00</OMEGA_0>
+			<i_0>9.50229191282804808e-01</i_0>
+			<omega>-2.71676891930177256e+00</omega>
+			<OMEGAdot>-7.78032408172749087e-09</OMEGAdot>
+			<idot>-2.75011455330984601e-11</idot>
+			<Cuc>6.13741576671600342e-06</Cuc>
+			<Cus>1.14180147647857666e-05</Cus>
+			<Crc>1.56000000000000000e+02</Crc>
+			<Crs>1.20250000000000000e+02</Crs>
+			<Cic>-6.14672899246215820e-08</Cic>
+			<Cis>-1.04308128356933594e-07</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>-7.56788067519664764e-05</af0>
+			<af1>-2.72848410531878391e-12</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>41</IODE_SF2>
+			<IODE_SF3>41</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>-1.95577740669250488e-08</TGD>
+			<IODC>41</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 	<item>
 		<first>28</first>
 		<second>
-			<i_satellite_PRN>28</i_satellite_PRN>
-			<d_TOW>5.18448000000000000e+05</d_TOW>
-			<d_IODE_SF2>3.30000000000000000e+01</d_IODE_SF2>
-			<d_IODE_SF3>3.30000000000000000e+01</d_IODE_SF3>
-			<d_Crs>-1.27750000000000000e+02</d_Crs>
-			<d_Delta_n>4.04302555109966970e-09</d_Delta_n>
-			<d_M_0>-1.16607683198628931e+00</d_M_0>
-			<d_Cuc>-6.37024641036987305e-06</d_Cuc>
-			<d_e_eccentricity>1.97223023278638686e-02</d_e_eccentricity>
-			<d_Cus>5.66989183425903320e-06</d_Cus>
-			<d_sqrt_A>5.15368548965454102e+03</d_sqrt_A>
-			<d_Toe>5.18400000000000000e+05</d_Toe>
-			<d_Toc>5.18400000000000000e+05</d_Toc>
-			<d_Cic>-1.37835741043090820e-07</d_Cic>
-			<d_OMEGA0>-1.08006546321039543e+00</d_OMEGA0>
-			<d_Cis>4.35858964920043945e-07</d_Cis>
-			<d_i_0>9.87961552655681530e-01</d_i_0>
-			<d_Crc>2.84718750000000000e+02</d_Crc>
-			<d_OMEGA>-1.69047108635756738e+00</d_OMEGA>
-			<d_OMEGA_DOT>-8.17855495535612472e-09</d_OMEGA_DOT>
-			<d_IDOT>-4.44661379074124424e-10</d_IDOT>
-			<i_code_on_L2>0</i_code_on_L2>
-			<i_GPS_week>799</i_GPS_week>
-			<b_L2_P_data_flag>0</b_L2_P_data_flag>
-			<i_SV_accuracy>2</i_SV_accuracy>
-			<i_SV_health>0</i_SV_health>
-			<d_TGD>-1.11758708953857422e-08</d_TGD>
-			<d_IODC>3.30000000000000000e+01</d_IODC>
-			<i_AODO>27900</i_AODO>
-			<b_fit_interval_flag>0</b_fit_interval_flag>
-			<d_spare1>0.00000000000000000e+00</d_spare1>
-			<d_spare2>0.00000000000000000e+00</d_spare2>
-			<d_A_f0>4.06486913561820984e-04</d_A_f0>
-			<d_A_f1>2.61479726759716828e-12</d_A_f1>
-			<d_A_f2>0.00000000000000000e+00</d_A_f2>
-			<b_integrity_status_flag>0</b_integrity_status_flag>
-			<b_alert_flag>0</b_alert_flag>
-			<b_antispoofing_flag>0</b_antispoofing_flag>
+			<PRN>28</PRN>
+			<M_0>-1.16607683198628931e+00</M_0>
+			<delta_n>4.04302555109966970e-09</delta_n>
+			<ecc>1.97223023278638686e-02</ecc>
+			<sqrtA>5.15368548965454102e+03</sqrtA>
+			<OMEGA_0>-1.08006546321039543e+00</OMEGA_0>
+			<i_0>9.87961552655681530e-01</i_0>
+			<omega>-1.69047108635756738e+00</omega>
+			<OMEGAdot>-8.17855495535612472e-09</OMEGAdot>
+			<idot>-4.44661379074124424e-10</idot>
+			<Cuc>-6.37024641036987305e-06</Cuc>
+			<Cus>5.66989183425903320e-06</Cus>
+			<Crc>2.84718750000000000e+02</Crc>
+			<Crs>-1.27750000000000000e+02</Crs>
+			<Cic>-1.37835741043090820e-07</Cic>
+			<Cis>4.35858964920043945e-07</Cis>
+			<toe>518400</toe>
+			<toc>518400</toc>
+			<af0>4.06486913561820984e-04</af0>
+			<af1>2.61479726759716828e-12</af1>
+			<af2>0.00000000000000000e+00</af2>
+			<WN>799</WN>
+			<tow>518448</tow>
+			<satClkDrift>0.00000000000000000e+00</satClkDrift>
+			<dtr>0.00000000000000000e+00</dtr>
+			<IODE_SF2>33</IODE_SF2>
+			<IODE_SF3>33</IODE_SF3>
+			<code_on_L2>0</code_on_L2>
+			<L2_P_data_flag>0</L2_P_data_flag>
+			<SV_accuracy>2</SV_accuracy>
+			<SV_health>0</SV_health>
+			<TGD>-1.11758708953857422e-08</TGD>
+			<IODC>33</IODC>
+			<AODO>27900</AODO>
+			<fit_interval_flag>0</fit_interval_flag>
+			<spare1>0.00000000000000000e+00</spare1>
+			<spare2>0.00000000000000000e+00</spare2>
+			<integrity_status_flag>0</integrity_status_flag>
+			<alert_flag>0</alert_flag>
+			<antispoofing_flag>0</antispoofing_flag>
 		</second>
 	</item>
 </GNSS-SDR_ephemeris_map>
diff --git a/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml.license b/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml.license
new file mode 100644
index 000000000..dc15f4512
--- /dev/null
+++ b/tests/data/rtklib_test/eph_GPS_L1CA_test1.xml.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: 2018 Javier Arribas <javier.arribas@cttc.es>
diff --git a/tests/data/rtklib_test/obs_test1.xml b/tests/data/rtklib_test/obs_test1.xml
index db34cdef9..3cadf5e21 100644
--- a/tests/data/rtklib_test/obs_test1.xml
+++ b/tests/data/rtklib_test/obs_test1.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
-<!-- SPDX-FileCopyrightText: 2018 Javier Arribas <javier.arribas@cttc.es> -->
 <!DOCTYPE boost_serialization>
 <boost_serialization signature="serialization::archive" version="12">
 <GNSS-SDR_gnss_synchro_map class_id="0" tracking_level="0" version="0">
@@ -22,7 +20,6 @@
 			<Acq_doppler_hz>-2.50000000000000000e+03</Acq_doppler_hz>
 			<Acq_samplestamp_samples>10791</Acq_samplestamp_samples>
 			<Acq_doppler_step>0</Acq_doppler_step>
-			<Flag_valid_acquisition>0</Flag_valid_acquisition>
 			<fs>2600000</fs>
 			<Prompt_I>-3.85959140625000000e+04</Prompt_I>
 			<Prompt_Q>-9.03592163085937500e+02</Prompt_Q>
@@ -31,14 +28,17 @@
 			<Carrier_phase_rads>8.35350813421410858e+05</Carrier_phase_rads>
 			<Code_phase_samples>3.31084377635761484e-01</Code_phase_samples>
 			<Tracking_sample_counter>133923691</Tracking_sample_counter>
-			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
 			<correlation_length_ms>1</correlation_length_ms>
-			<Flag_valid_word>1</Flag_valid_word>
 			<TOW_at_current_symbol_ms>518451424</TOW_at_current_symbol_ms>
 			<Pseudorange_m>2.28178186234515086e+07</Pseudorange_m>
 			<RX_time>5.18451500000000000e+05</RX_time>
-			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
 			<interp_TOW_ms>5.18451423887949765e+08</interp_TOW_ms>
+			<Flag_valid_acquisition>0</Flag_valid_acquisition>
+			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
+			<Flag_valid_word>1</Flag_valid_word>
+			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
+			<Flag_PLL_180_deg_phase_locked>0</Flag_PLL_180_deg_phase_locked>
+			<Flag_cycle_slip>0</Flag_cycle_slip>
 		</second>
 	</item>
 	<item>
@@ -57,7 +57,6 @@
 			<Acq_doppler_hz>-3.00000000000000000e+03</Acq_doppler_hz>
 			<Acq_samplestamp_samples>68450858</Acq_samplestamp_samples>
 			<Acq_doppler_step>0</Acq_doppler_step>
-			<Flag_valid_acquisition>0</Flag_valid_acquisition>
 			<fs>2600000</fs>
 			<Prompt_I>-4.34972734375000000e+04</Prompt_I>
 			<Prompt_Q>4.21364685058593750e+02</Prompt_Q>
@@ -66,14 +65,17 @@
 			<Carrier_phase_rads>4.93910706686261110e+05</Carrier_phase_rads>
 			<Code_phase_samples>7.36033200862493686e-01</Code_phase_samples>
 			<Tracking_sample_counter>133923971</Tracking_sample_counter>
-			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
 			<correlation_length_ms>1</correlation_length_ms>
-			<Flag_valid_word>1</Flag_valid_word>
 			<TOW_at_current_symbol_ms>518451431</TOW_at_current_symbol_ms>
 			<Pseudorange_m>2.07516033774388395e+07</Pseudorange_m>
 			<RX_time>5.18451500000000000e+05</RX_time>
-			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
 			<interp_TOW_ms>5.18451430780101955e+08</interp_TOW_ms>
+			<Flag_valid_acquisition>0</Flag_valid_acquisition>
+			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
+			<Flag_valid_word>1</Flag_valid_word>
+			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
+			<Flag_PLL_180_deg_phase_locked>0</Flag_PLL_180_deg_phase_locked>
+			<Flag_cycle_slip>0</Flag_cycle_slip>
 		</second>
 	</item>
 	<item>
@@ -92,7 +94,6 @@
 			<Acq_doppler_hz>-3.00000000000000000e+03</Acq_doppler_hz>
 			<Acq_samplestamp_samples>1350770</Acq_samplestamp_samples>
 			<Acq_doppler_step>0</Acq_doppler_step>
-			<Flag_valid_acquisition>0</Flag_valid_acquisition>
 			<fs>2600000</fs>
 			<Prompt_I>4.46268046875000000e+04</Prompt_I>
 			<Prompt_Q>-3.98811938476562500e+03</Prompt_Q>
@@ -101,14 +102,17 @@
 			<Carrier_phase_rads>9.35704822809229488e+05</Carrier_phase_rads>
 			<Code_phase_samples>9.30327007595224131e-01</Code_phase_samples>
 			<Tracking_sample_counter>133923941</Tracking_sample_counter>
-			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
 			<correlation_length_ms>1</correlation_length_ms>
-			<Flag_valid_word>1</Flag_valid_word>
 			<TOW_at_current_symbol_ms>518451436</TOW_at_current_symbol_ms>
 			<Pseudorange_m>1.92492043561209217e+07</Pseudorange_m>
 			<RX_time>5.18451500000000000e+05</RX_time>
-			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
 			<interp_TOW_ms>5.18451435791565657e+08</interp_TOW_ms>
+			<Flag_valid_acquisition>0</Flag_valid_acquisition>
+			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
+			<Flag_valid_word>1</Flag_valid_word>
+			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
+			<Flag_PLL_180_deg_phase_locked>0</Flag_PLL_180_deg_phase_locked>
+			<Flag_cycle_slip>0</Flag_cycle_slip>
 		</second>
 	</item>
 	<item>
@@ -127,7 +131,6 @@
 			<Acq_doppler_hz>1.00000000000000000e+03</Acq_doppler_hz>
 			<Acq_samplestamp_samples>994247</Acq_samplestamp_samples>
 			<Acq_doppler_step>0</Acq_doppler_step>
-			<Flag_valid_acquisition>0</Flag_valid_acquisition>
 			<fs>2600000</fs>
 			<Prompt_I>3.98655546875000000e+04</Prompt_I>
 			<Prompt_Q>-8.63781860351562500e+02</Prompt_Q>
@@ -136,14 +139,17 @@
 			<Carrier_phase_rads>-3.54128275530727289e+05</Carrier_phase_rads>
 			<Code_phase_samples>4.08304036132904002e-01</Code_phase_samples>
 			<Tracking_sample_counter>133922883</Tracking_sample_counter>
-			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
 			<correlation_length_ms>1</correlation_length_ms>
-			<Flag_valid_word>1</Flag_valid_word>
 			<TOW_at_current_symbol_ms>518451429</TOW_at_current_symbol_ms>
 			<Pseudorange_m>2.12256989876578376e+07</Pseudorange_m>
 			<RX_time>5.18451500000000000e+05</RX_time>
-			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
 			<interp_TOW_ms>5.18451429198689222e+08</interp_TOW_ms>
+			<Flag_valid_acquisition>0</Flag_valid_acquisition>
+			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
+			<Flag_valid_word>1</Flag_valid_word>
+			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
+			<Flag_PLL_180_deg_phase_locked>0</Flag_PLL_180_deg_phase_locked>
+			<Flag_cycle_slip>0</Flag_cycle_slip>
 		</second>
 	</item>
 	<item>
@@ -162,7 +168,6 @@
 			<Acq_doppler_hz>1.75000000000000000e+03</Acq_doppler_hz>
 			<Acq_samplestamp_samples>4917751</Acq_samplestamp_samples>
 			<Acq_doppler_step>0</Acq_doppler_step>
-			<Flag_valid_acquisition>0</Flag_valid_acquisition>
 			<fs>2600000</fs>
 			<Prompt_I>-4.72456406250000000e+04</Prompt_I>
 			<Prompt_Q>-2.63723022460937500e+02</Prompt_Q>
@@ -171,14 +176,17 @@
 			<Carrier_phase_rads>-5.72184006019302527e+05</Carrier_phase_rads>
 			<Code_phase_samples>5.89544135488722532e-01</Code_phase_samples>
 			<Tracking_sample_counter>133922337</Tracking_sample_counter>
-			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
 			<correlation_length_ms>1</correlation_length_ms>
-			<Flag_valid_word>1</Flag_valid_word>
 			<TOW_at_current_symbol_ms>518451430</TOW_at_current_symbol_ms>
 			<Pseudorange_m>2.08629709015843943e+07</Pseudorange_m>
 			<RX_time>5.18451500000000000e+05</RX_time>
-			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
 			<interp_TOW_ms>5.18451430408619881e+08</interp_TOW_ms>
+			<Flag_valid_acquisition>0</Flag_valid_acquisition>
+			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
+			<Flag_valid_word>1</Flag_valid_word>
+			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
+			<Flag_PLL_180_deg_phase_locked>0</Flag_PLL_180_deg_phase_locked>
+			<Flag_cycle_slip>0</Flag_cycle_slip>
 		</second>
 	</item>
 	<item>
@@ -197,7 +205,6 @@
 			<Acq_doppler_hz>2.50000000000000000e+02</Acq_doppler_hz>
 			<Acq_samplestamp_samples>514377</Acq_samplestamp_samples>
 			<Acq_doppler_step>0</Acq_doppler_step>
-			<Flag_valid_acquisition>0</Flag_valid_acquisition>
 			<fs>2600000</fs>
 			<Prompt_I>4.27717460937500000e+04</Prompt_I>
 			<Prompt_Q>-9.45822082519531250e+02</Prompt_Q>
@@ -206,14 +213,17 @@
 			<Carrier_phase_rads>-9.09813659855529113e+04</Carrier_phase_rads>
 			<Code_phase_samples>6.57473345280777721e-01</Code_phase_samples>
 			<Tracking_sample_counter>133923172</Tracking_sample_counter>
-			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
 			<correlation_length_ms>1</correlation_length_ms>
-			<Flag_valid_word>1</Flag_valid_word>
 			<TOW_at_current_symbol_ms>518451440</TOW_at_current_symbol_ms>
 			<Pseudorange_m>1.79613337841309197e+07</Pseudorange_m>
 			<RX_time>5.18451500000000000e+05</RX_time>
-			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
 			<interp_TOW_ms>5.18451440087439477e+08</interp_TOW_ms>
+			<Flag_valid_acquisition>0</Flag_valid_acquisition>
+			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
+			<Flag_valid_word>1</Flag_valid_word>
+			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
+			<Flag_PLL_180_deg_phase_locked>0</Flag_PLL_180_deg_phase_locked>
+			<Flag_cycle_slip>0</Flag_cycle_slip>
 		</second>
 	</item>
 	<item>
@@ -232,7 +242,6 @@
 			<Acq_doppler_hz>2.25000000000000000e+03</Acq_doppler_hz>
 			<Acq_samplestamp_samples>7365787</Acq_samplestamp_samples>
 			<Acq_doppler_step>0</Acq_doppler_step>
-			<Flag_valid_acquisition>0</Flag_valid_acquisition>
 			<fs>2600000</fs>
 			<Prompt_I>-3.96159960937500000e+04</Prompt_I>
 			<Prompt_Q>-5.03847460937500000e+03</Prompt_Q>
@@ -241,14 +250,17 @@
 			<Carrier_phase_rads>-7.04913853936602012e+05</Carrier_phase_rads>
 			<Code_phase_samples>3.21518194999043772e-01</Code_phase_samples>
 			<Tracking_sample_counter>133922169</Tracking_sample_counter>
-			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
 			<correlation_length_ms>1</correlation_length_ms>
-			<Flag_valid_word>1</Flag_valid_word>
 			<TOW_at_current_symbol_ms>518451430</TOW_at_current_symbol_ms>
 			<Pseudorange_m>2.08435687343175523e+07</Pseudorange_m>
 			<RX_time>5.18451500000000000e+05</RX_time>
-			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
 			<interp_TOW_ms>5.18451430473338544e+08</interp_TOW_ms>
+			<Flag_valid_acquisition>0</Flag_valid_acquisition>
+			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
+			<Flag_valid_word>1</Flag_valid_word>
+			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
+			<Flag_PLL_180_deg_phase_locked>0</Flag_PLL_180_deg_phase_locked>
+			<Flag_cycle_slip>0</Flag_cycle_slip>
 		</second>
 	</item>
 	<item>
@@ -267,7 +279,6 @@
 			<Acq_doppler_hz>2.75000000000000000e+03</Acq_doppler_hz>
 			<Acq_samplestamp_samples>2173576</Acq_samplestamp_samples>
 			<Acq_doppler_step>0</Acq_doppler_step>
-			<Flag_valid_acquisition>0</Flag_valid_acquisition>
 			<fs>2600000</fs>
 			<Prompt_I>4.00322539062500000e+04</Prompt_I>
 			<Prompt_Q>-3.88590087890625000e+02</Prompt_Q>
@@ -276,14 +287,17 @@
 			<Carrier_phase_rads>-8.99142229977656389e+05</Carrier_phase_rads>
 			<Code_phase_samples>1.02370741655249731e-01</Code_phase_samples>
 			<Tracking_sample_counter>133922664</Tracking_sample_counter>
-			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
 			<correlation_length_ms>1</correlation_length_ms>
-			<Flag_valid_word>1</Flag_valid_word>
 			<TOW_at_current_symbol_ms>518451438</TOW_at_current_symbol_ms>
 			<Pseudorange_m>1.85022797143675610e+07</Pseudorange_m>
 			<RX_time>5.18451500000000000e+05</RX_time>
-			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
 			<interp_TOW_ms>5.18451438283038080e+08</interp_TOW_ms>
+			<Flag_valid_acquisition>0</Flag_valid_acquisition>
+			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
+			<Flag_valid_word>1</Flag_valid_word>
+			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
+			<Flag_PLL_180_deg_phase_locked>0</Flag_PLL_180_deg_phase_locked>
+			<Flag_cycle_slip>0</Flag_cycle_slip>
 		</second>
 	</item>
 	<item>
@@ -302,7 +316,6 @@
 			<Acq_doppler_hz>3.00000000000000000e+03</Acq_doppler_hz>
 			<Acq_samplestamp_samples>7464974</Acq_samplestamp_samples>
 			<Acq_doppler_step>0</Acq_doppler_step>
-			<Flag_valid_acquisition>0</Flag_valid_acquisition>
 			<fs>2600000</fs>
 			<Prompt_I>-4.03654140625000000e+04</Prompt_I>
 			<Prompt_Q>3.92351245117187500e+03</Prompt_Q>
@@ -311,14 +324,17 @@
 			<Carrier_phase_rads>-9.28340507655202877e+05</Carrier_phase_rads>
 			<Code_phase_samples>5.73995602361264901e-01</Code_phase_samples>
 			<Tracking_sample_counter>133923741</Tracking_sample_counter>
-			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
 			<correlation_length_ms>1</correlation_length_ms>
-			<Flag_valid_word>1</Flag_valid_word>
 			<TOW_at_current_symbol_ms>518451427</TOW_at_current_symbol_ms>
 			<Pseudorange_m>2.19242346189941987e+07</Pseudorange_m>
 			<RX_time>5.18451500000000000e+05</RX_time>
-			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
 			<interp_TOW_ms>5.18451426868625164e+08</interp_TOW_ms>
+			<Flag_valid_acquisition>0</Flag_valid_acquisition>
+			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
+			<Flag_valid_word>1</Flag_valid_word>
+			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
+			<Flag_PLL_180_deg_phase_locked>0</Flag_PLL_180_deg_phase_locked>
+			<Flag_cycle_slip>0</Flag_cycle_slip>
 		</second>
 	</item>
 	<item>
@@ -337,7 +353,6 @@
 			<Acq_doppler_hz>5.00000000000000000e+02</Acq_doppler_hz>
 			<Acq_samplestamp_samples>1859813</Acq_samplestamp_samples>
 			<Acq_doppler_step>0</Acq_doppler_step>
-			<Flag_valid_acquisition>0</Flag_valid_acquisition>
 			<fs>2600000</fs>
 			<Prompt_I>3.87814335937500000e+04</Prompt_I>
 			<Prompt_Q>2.13637329101562500e+03</Prompt_Q>
@@ -346,14 +361,17 @@
 			<Carrier_phase_rads>-1.78723083774703584e+05</Carrier_phase_rads>
 			<Code_phase_samples>3.47952294631795667e-01</Code_phase_samples>
 			<Tracking_sample_counter>133924211</Tracking_sample_counter>
-			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
 			<correlation_length_ms>1</correlation_length_ms>
-			<Flag_valid_word>1</Flag_valid_word>
 			<TOW_at_current_symbol_ms>518451439</TOW_at_current_symbol_ms>
 			<Pseudorange_m>1.83808922785463184e+07</Pseudorange_m>
 			<RX_time>5.18451500000000000e+05</RX_time>
-			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
 			<interp_TOW_ms>5.18451438687942982e+08</interp_TOW_ms>
+			<Flag_valid_acquisition>0</Flag_valid_acquisition>
+			<Flag_valid_symbol_output>1</Flag_valid_symbol_output>
+			<Flag_valid_word>1</Flag_valid_word>
+			<Flag_valid_pseudorange>1</Flag_valid_pseudorange>
+			<Flag_PLL_180_deg_phase_locked>0</Flag_PLL_180_deg_phase_locked>
+			<Flag_cycle_slip>0</Flag_cycle_slip>
 		</second>
 	</item>
 </GNSS-SDR_gnss_synchro_map>
diff --git a/tests/data/rtklib_test/obs_test1.xml.license b/tests/data/rtklib_test/obs_test1.xml.license
new file mode 100644
index 000000000..dc15f4512
--- /dev/null
+++ b/tests/data/rtklib_test/obs_test1.xml.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: 2018 Javier Arribas <javier.arribas@cttc.es>
diff --git a/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc b/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
index cebd4615c..966f4805a 100644
--- a/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
+++ b/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
@@ -20,6 +20,9 @@
 #include "in_memory_configuration.h"
 #include "pvt_conf.h"
 #include "rtklib_solver.h"
+#include "sensor_data/sensor_data_aggregator.h"
+#include "sensor_data/sensor_data_source_configuration.h"
+#include "signal_flag.h"
 #include <armadillo>
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/archive/xml_oarchive.hpp>
@@ -378,7 +381,6 @@ TEST(RTKLibSolverTest, test1)
 {
     // test case #1: GPS L1 CA simulated with gnss-sim
     std::string path = std::string(TEST_PATH);
-    int nchannels = 8;
     std::string dump_filename = ".rtklib_solver_dump.dat";
     bool flag_dump_to_file = false;
     bool save_to_mat = false;
@@ -386,8 +388,15 @@ TEST(RTKLibSolverTest, test1)
 
     Pvt_Conf conf;
     conf.use_e6_for_pvt = false;
-    auto d_ls_pvt = std::make_unique<Rtklib_Solver>(rtk, conf, nchannels, dump_filename, 1, flag_dump_to_file, save_to_mat);
-    d_ls_pvt->set_averaging_depth(1);
+    auto d_ls_pvt = std::make_unique<Rtklib_Solver>(rtk, conf, dump_filename, GPS_1C, flag_dump_to_file, save_to_mat);
+    // the scenario was simulated in December 2014 (GPS week 1823, transmitted mod-1024
+    // week 799), so the week rollover must be resolved to the 1999-2019 era
+    d_ls_pvt->set_pre_2009_file(true);
+
+    // sensor data aggregator with no external sensors
+    auto sensor_configuration = std::make_shared<InMemoryConfiguration>();
+    const SensorDataSourceConfiguration sensor_data_source_configuration(sensor_configuration.get());
+    const SensorDataAggregator sensor_data_aggregator(sensor_data_source_configuration, {});
 
     // load ephemeris
     std::string eph_xml_filename = path + "data/rtklib_test/eph_GPS_L1CA_test1.xml";
@@ -443,7 +452,7 @@ TEST(RTKLibSolverTest, test1)
 
     // solve
     bool pvt_valid = false;
-    if (d_ls_pvt->get_PVT(gnss_synchro_map, false))
+    if (d_ls_pvt->get_PVT(gnss_synchro_map, 0.02, sensor_data_aggregator))
         {
             // DEBUG MESSAGE: Display position in console output
             if (d_ls_pvt->is_valid_position())