diff --git a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_pkg.vhd b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_pkg.vhd
index 2456f4bed0430839c29c9dc5d4988c4fa9bd61fa..ff1823f32a6a1c6548be0944cc9ba1a5e1cf5bcf 100644
--- a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_pkg.vhd
+++ b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_pkg.vhd
@@ -34,19 +34,19 @@ PACKAGE tb_sdp_pkg is
   -----------------------------------------------------------------------------
   -- Statistics offload
   -----------------------------------------------------------------------------
-  FUNCTION func_sdp_verify_stat_header(g_statistics_type : STRING; in_hdr, exp_hdr : t_sdp_stat_header; sdp_info : t_sdp_info) RETURN BOOLEAN;
+  FUNCTION func_sdp_verify_stat_header(g_statistics_type : STRING; in_hdr, exp_hdr : t_sdp_stat_header) RETURN BOOLEAN;
 
   -----------------------------------------------------------------------------
   -- Beamlet output via 10GbE to CEP (= central processor)
   -----------------------------------------------------------------------------
-  FUNCTION func_sdp_verify_cep_header(in_hdr, exp_hdr : t_sdp_cep_header; sdp_info : t_sdp_info) RETURN BOOLEAN;
+  FUNCTION func_sdp_verify_cep_header(in_hdr, exp_hdr : t_sdp_cep_header) RETURN BOOLEAN;
 
 
 END PACKAGE tb_sdp_pkg;
 
 PACKAGE BODY tb_sdp_pkg IS
 
-  FUNCTION func_sdp_verify_stat_header(g_statistics_type : STRING; in_hdr, exp_hdr : t_sdp_stat_header; sdp_info : t_sdp_info) RETURN BOOLEAN IS
+  FUNCTION func_sdp_verify_stat_header(g_statistics_type : STRING; in_hdr, exp_hdr : t_sdp_stat_header) RETURN BOOLEAN IS
   BEGIN
     -- eth header
     ASSERT in_hdr.eth.dst_mac        = exp_hdr.eth.dst_mac  REPORT "Wrong " & g_statistics_type & " eth.dst_mac"  SEVERITY ERROR;
@@ -74,20 +74,20 @@ PACKAGE BODY tb_sdp_pkg IS
     ASSERT in_hdr.udp.checksum       = exp_hdr.udp.checksum     REPORT "Wrong " & g_statistics_type & " udp.checksum"     SEVERITY ERROR;
 
     -- app header
-    ASSERT in_hdr.app.sdp_marker                              = exp_hdr.app.sdp_marker     REPORT "Wrong " & g_statistics_type & " app.sdp_marker"         SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_version_id                          = exp_hdr.app.sdp_version_id REPORT "Wrong " & g_statistics_type & " app.sdp_version_id"     SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_observation_id                      = sdp_info.observation_id    REPORT "Wrong " & g_statistics_type & " app.sdp_observation_id" SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_station_id                          = sdp_info.station_id        REPORT "Wrong " & g_statistics_type & " app.sdp_station_id"     SEVERITY ERROR;
-
-    ASSERT in_hdr.app.sdp_source_info_antenna_band_id         = slv(sdp_info.antenna_band_index)                        REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_antenna_band_id"         SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_nyquist_zone_id         =     sdp_info.nyquist_zone_index                         REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_nyquist_zone_id"         SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_f_adc                   = slv(sdp_info.f_adc)                                     REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_f_adc"                   SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_fsub_type               = slv(sdp_info.fsub_type)                                 REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_fsub_type"               SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_payload_error           =     exp_hdr.app.sdp_source_info_payload_error           REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_payload_error"           SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_beam_repositioning_flag = slv(sdp_info.beam_repositioning_flag)                   REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_beam_repositioning_flag" SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_subband_calibrated_flag =     exp_hdr.app.sdp_source_info_subband_calibrated_flag REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_subband_calibrated_flag" SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_reserved                =     exp_hdr.app.sdp_source_info_reserved                REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_reserved"                SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_gn_id                   =     exp_hdr.app.sdp_source_info_gn_id                   REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_gn_id"                   SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_marker                              = exp_hdr.app.sdp_marker         REPORT "Wrong " & g_statistics_type & " app.sdp_marker"         SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_version_id                          = exp_hdr.app.sdp_version_id     REPORT "Wrong " & g_statistics_type & " app.sdp_version_id"     SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_observation_id                      = exp_hdr.app.sdp_observation_id REPORT "Wrong " & g_statistics_type & " app.sdp_observation_id" SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_station_id                          = exp_hdr.app.sdp_station_id     REPORT "Wrong " & g_statistics_type & " app.sdp_station_id"     SEVERITY ERROR;
+
+    ASSERT in_hdr.app.sdp_source_info_antenna_band_id         = exp_hdr.app.sdp_source_info_antenna_band_id         REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_antenna_band_id"         SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_nyquist_zone_id         = exp_hdr.app.sdp_source_info_nyquist_zone_id         REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_nyquist_zone_id"         SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_f_adc                   = exp_hdr.app.sdp_source_info_f_adc                   REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_f_adc"                   SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_fsub_type               = exp_hdr.app.sdp_source_info_fsub_type               REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_fsub_type"               SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_payload_error           = exp_hdr.app.sdp_source_info_payload_error           REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_payload_error"           SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_beam_repositioning_flag = exp_hdr.app.sdp_source_info_beam_repositioning_flag REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_beam_repositioning_flag" SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_subband_calibrated_flag = exp_hdr.app.sdp_source_info_subband_calibrated_flag REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_subband_calibrated_flag" SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_reserved                = exp_hdr.app.sdp_source_info_reserved                REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_reserved"                SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_gn_id                   = exp_hdr.app.sdp_source_info_gn_id                   REPORT "Wrong " & g_statistics_type & " app.sdp_source_info_gn_id"                   SEVERITY ERROR;
 
     ASSERT in_hdr.app.sdp_reserved                            = exp_hdr.app.sdp_reserved                         REPORT "Wrong " & g_statistics_type & " app.sdp_reserved"                         SEVERITY ERROR;
     ASSERT in_hdr.app.sdp_integration_interval                = exp_hdr.app.sdp_integration_interval             REPORT "Wrong " & g_statistics_type & " app.sdp_integration_interval"             SEVERITY ERROR;
@@ -109,14 +109,14 @@ PACKAGE BODY tb_sdp_pkg IS
     ASSERT in_hdr.app.sdp_nof_signal_inputs                   = exp_hdr.app.sdp_nof_signal_inputs                REPORT "Wrong " & g_statistics_type & " app.sdp_nof_signal_inputs"                SEVERITY ERROR;
     ASSERT in_hdr.app.sdp_nof_bytes_per_statistic             = exp_hdr.app.sdp_nof_bytes_per_statistic          REPORT "Wrong " & g_statistics_type & " app.sdp_nof_bytes_per_statistic"          SEVERITY ERROR;
     ASSERT in_hdr.app.sdp_nof_statistics_per_packet           = exp_hdr.app.sdp_nof_statistics_per_packet        REPORT "Wrong " & g_statistics_type & " app.sdp_nof_statistics_per_packet"        SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_block_period                        = sdp_info.block_period                            REPORT "Wrong " & g_statistics_type & " app.sdp_block_period"                     SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_block_period                        = exp_hdr.app.sdp_block_period                     REPORT "Wrong " & g_statistics_type & " app.sdp_block_period"                     SEVERITY ERROR;
 
     ASSERT in_hdr.app.dp_bsn = exp_hdr.app.dp_bsn REPORT "Wrong " & g_statistics_type & " app.dp_bsn" SEVERITY ERROR;
     RETURN TRUE;
   END func_sdp_verify_stat_header;
 
 
-  FUNCTION func_sdp_verify_cep_header(in_hdr, exp_hdr : t_sdp_cep_header; sdp_info : t_sdp_info) RETURN BOOLEAN IS
+  FUNCTION func_sdp_verify_cep_header(in_hdr, exp_hdr : t_sdp_cep_header) RETURN BOOLEAN IS
   BEGIN
     -- eth header
     ASSERT in_hdr.eth.dst_mac        = exp_hdr.eth.dst_mac  REPORT "Wrong beamlet eth.dst_mac"  SEVERITY ERROR;
@@ -144,26 +144,26 @@ PACKAGE BODY tb_sdp_pkg IS
     ASSERT in_hdr.udp.checksum       = exp_hdr.udp.checksum     REPORT "Wrong beamlet udp.checksum"     SEVERITY ERROR;
 
     -- app header
-    ASSERT in_hdr.app.sdp_marker                              = exp_hdr.app.sdp_marker     REPORT "Wrong beamlet app.sdp_marker"         SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_version_id                          = exp_hdr.app.sdp_version_id REPORT "Wrong beamlet app.sdp_version_id"     SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_observation_id                      = sdp_info.observation_id    REPORT "Wrong beamlet app.sdp_observation_id" SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_station_id                          = sdp_info.station_id        REPORT "Wrong beamlet app.sdp_station_id"     SEVERITY ERROR;
-
-    ASSERT in_hdr.app.sdp_source_info_antenna_band_id    = slv(sdp_info.antenna_band_index)              REPORT "Wrong beamlet app.sdp_source_info_antenna_band_id"    SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_nyquist_zone_id    =     sdp_info.nyquist_zone_index               REPORT "Wrong beamlet app.sdp_source_info_nyquist_zone_id"    SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_f_adc              = slv(sdp_info.f_adc)                           REPORT "Wrong beamlet app.sdp_source_info_f_adc"              SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_fsub_type          = slv(sdp_info.fsub_type)                       REPORT "Wrong beamlet app.sdp_source_info_fsub_type"          SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_payload_error      =     exp_hdr.app.sdp_source_info_payload_error REPORT "Wrong beamlet app.sdp_source_info_payload_error"      SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_repositioning_flag = slv(sdp_info.beam_repositioning_flag)         REPORT "Wrong beamlet app.sdp_source_info_repositioning_flag" SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_beamlet_width      =     exp_hdr.app.sdp_source_info_beamlet_width REPORT "Wrong beamlet app.sdp_source_info_beamlet_width"      SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_source_info_gn_id              =     exp_hdr.app.sdp_source_info_gn_id         REPORT "Wrong beamlet app.sdp_source_info_gn_id"              SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_marker                              = exp_hdr.app.sdp_marker         REPORT "Wrong beamlet app.sdp_marker"         SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_version_id                          = exp_hdr.app.sdp_version_id     REPORT "Wrong beamlet app.sdp_version_id"     SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_observation_id                      = exp_hdr.app.sdp_observation_id REPORT "Wrong beamlet app.sdp_observation_id" SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_station_id                          = exp_hdr.app.sdp_station_id     REPORT "Wrong beamlet app.sdp_station_id"     SEVERITY ERROR;
+
+    ASSERT in_hdr.app.sdp_source_info_antenna_band_id    = exp_hdr.app.sdp_source_info_antenna_band_id    REPORT "Wrong beamlet app.sdp_source_info_antenna_band_id"    SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_nyquist_zone_id    = exp_hdr.app.sdp_source_info_nyquist_zone_id    REPORT "Wrong beamlet app.sdp_source_info_nyquist_zone_id"    SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_f_adc              = exp_hdr.app.sdp_source_info_f_adc              REPORT "Wrong beamlet app.sdp_source_info_f_adc"              SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_fsub_type          = exp_hdr.app.sdp_source_info_fsub_type          REPORT "Wrong beamlet app.sdp_source_info_fsub_type"          SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_payload_error      = exp_hdr.app.sdp_source_info_payload_error      REPORT "Wrong beamlet app.sdp_source_info_payload_error"      SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_repositioning_flag = exp_hdr.app.sdp_source_info_repositioning_flag REPORT "Wrong beamlet app.sdp_source_info_repositioning_flag" SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_beamlet_width      = exp_hdr.app.sdp_source_info_beamlet_width      REPORT "Wrong beamlet app.sdp_source_info_beamlet_width"      SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_source_info_gn_id              = exp_hdr.app.sdp_source_info_gn_id              REPORT "Wrong beamlet app.sdp_source_info_gn_id"              SEVERITY ERROR;
 
     ASSERT in_hdr.app.sdp_reserved               = exp_hdr.app.sdp_reserved               REPORT "Wrong beamlet app.sdp_reserved"               SEVERITY ERROR;
     ASSERT in_hdr.app.sdp_beamlet_scale          = exp_hdr.app.sdp_beamlet_scale          REPORT "Wrong beamlet app.sdp_beamlet_scale"          SEVERITY ERROR;
     ASSERT in_hdr.app.sdp_beamlet_index          = exp_hdr.app.sdp_beamlet_index          REPORT "Wrong beamlet app.sdp_beamlet_index"          SEVERITY ERROR;
     ASSERT in_hdr.app.sdp_nof_blocks_per_packet  = exp_hdr.app.sdp_nof_blocks_per_packet  REPORT "Wrong beamlet app.sdp_nof_blocks_per_packet"  SEVERITY ERROR;
     ASSERT in_hdr.app.sdp_nof_beamlets_per_block = exp_hdr.app.sdp_nof_beamlets_per_block REPORT "Wrong beamlet app.sdp_nof_beamlets_per_block" SEVERITY ERROR;
-    ASSERT in_hdr.app.sdp_block_period           = sdp_info.block_period                  REPORT "Wrong beamlet app.sdp_block_period"           SEVERITY ERROR;
+    ASSERT in_hdr.app.sdp_block_period           = exp_hdr.app.sdp_block_period           REPORT "Wrong beamlet app.sdp_block_period"           SEVERITY ERROR;
 
     ASSERT in_hdr.app.dp_bsn = exp_hdr.app.dp_bsn REPORT "Wrong beamlet app.dp_bsn" SEVERITY ERROR;
     RETURN TRUE;
diff --git a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_statistics_offload.vhd b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_statistics_offload.vhd
index d6bc51aad26a62d52ef006b75f6a569653b16743..24e9ea2bd2849c2ac9bce59626b9caa68c9a95eb 100644
--- a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_statistics_offload.vhd
+++ b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_statistics_offload.vhd
@@ -94,6 +94,20 @@ ARCHITECTURE tb OF tb_sdp_statistics_offload IS
   CONSTANT c_nof_signal_inputs         : NATURAL := func_sdp_get_stat_nof_signal_inputs(g_statistics_type);
   CONSTANT c_nof_packets_max           : NATURAL := func_sdp_get_stat_nof_packets(g_statistics_type, c_sdp_S_pn, g_P_sq, c_sdp_N_crosslets_max);
 
+  CONSTANT c_exp_sdp_info  :  t_sdp_info := (TO_UVEC(601, 16),   -- station_id
+                                              '0',                -- antenna_band_index
+                                              x"FFFFFFFF",        -- observation_id
+                                              b"01",              -- nyquist_zone_index, 0 = first, 1 = second, 2 = third
+                                              '1',                -- f_adc, 0 = 160 MHz, 1 = 200 MHz
+                                              '0',                -- fsub_type, 0 = critically sampled, 1 = oversampled
+                                              '0',                -- beam_repositioning_flag
+                                              x"01",              -- O_si, not used
+                                              x"02",              -- N_si, not used
+                                              TO_UVEC(g_O_rn, 8), -- O_rn
+                                              TO_UVEC(g_N_rn, 8), -- N_rn
+                                              x"1400"             -- block_period = 5120
+                                            );
+
   CONSTANT c_beamlet_index             : NATURAL := g_beamset_id * c_sdp_S_sub_bf;
 
   CONSTANT c_crosslets_info_rec        : t_sdp_crosslets_info := (offset_arr => (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15), step => 16);
@@ -183,26 +197,10 @@ ARCHITECTURE tb OF tb_sdp_statistics_offload IS
   SIGNAL rx_data                 : NATURAL;
   SIGNAL exp_data                : NATURAL;
 
-  -- Signals used to change settings of sdp_info.
-  SIGNAL sdp_info  :  t_sdp_info := (
-                        TO_UVEC(601, 16),   -- station_id
-                        '0',                -- antenna_band_index
-                        x"FFFFFFFF",        -- observation_id
-                        b"01",              -- nyquist_zone_index, 0 = first, 1 = second, 2 = third
-                        '1',                -- f_adc, 0 = 160 MHz, 1 = 200 MHz
-                        '0',                -- fsub_type, 0 = critically sampled, 1 = oversampled
-                        '0',                -- beam_repositioning_flag
-                        x"01",              -- O_si, not used
-                        x"02",              -- N_si, not used
-                        TO_UVEC(g_O_rn, 8), -- O_rn
-                        TO_UVEC(g_N_rn, 8), -- N_rn
-                        x"1400"             -- block_period = 5120
-                      );
-
-  SIGNAL gn_index  : NATURAL := g_gn_index;           -- this node GN
-  SIGNAL rn_index  : NATURAL := g_gn_index - g_O_rn;  -- this node RN
-  SIGNAL source_rn : NATURAL;  -- source node RN
-  SIGNAL source_gn : NATURAL;  -- source node GN
+  SIGNAL gn_index                : NATURAL := g_gn_index;           -- this node GN
+  SIGNAL rn_index                : NATURAL := g_gn_index - g_O_rn;  -- this node RN
+  SIGNAL source_rn               : NATURAL;  -- source node RN
+  SIGNAL source_gn               : NATURAL;  -- source node GN
 
   SIGNAL subband_calibrated_flag : STD_LOGIC := '0';
 
@@ -364,7 +362,7 @@ BEGIN
   -- . prepare expected XST signal_input_B index, assume crosslet transport in positive direction
   exp_xst_signal_input_B <= (source_gn MOD c_sdp_N_pn_max) * c_sdp_S_pn;
 
-  p_exp_sdp_stat_header : PROCESS(sdp_info, subband_calibrated_flag, gn_index, exp_dp_bsn, exp_sst_signal_input, exp_subband_index, exp_xst_signal_input_A, exp_xst_signal_input_B)
+  p_exp_sdp_stat_header : PROCESS(subband_calibrated_flag, gn_index, exp_dp_bsn, exp_sst_signal_input, exp_subband_index, exp_xst_signal_input_A, exp_xst_signal_input_B)
   BEGIN
     -- eth header
     exp_sdp_stat_header.eth.dst_mac        <= c_sdp_stat_eth_dst_mac;
@@ -394,15 +392,15 @@ BEGIN
     -- app header
     exp_sdp_stat_header.app.sdp_marker                              <= TO_UVEC(c_marker, 8);
     exp_sdp_stat_header.app.sdp_version_id                          <= TO_UVEC(c_sdp_stat_version_id, 8);
-    exp_sdp_stat_header.app.sdp_observation_id                      <= sdp_info.observation_id;
-    exp_sdp_stat_header.app.sdp_station_id                          <= sdp_info.station_id;
+    exp_sdp_stat_header.app.sdp_observation_id                      <= c_exp_sdp_info.observation_id;
+    exp_sdp_stat_header.app.sdp_station_id                          <= c_exp_sdp_info.station_id;
 
-    exp_sdp_stat_header.app.sdp_source_info_antenna_band_id         <= slv(sdp_info.antenna_band_index);
-    exp_sdp_stat_header.app.sdp_source_info_nyquist_zone_id         <=     sdp_info.nyquist_zone_index;
-    exp_sdp_stat_header.app.sdp_source_info_f_adc                   <= slv(sdp_info.f_adc);
-    exp_sdp_stat_header.app.sdp_source_info_fsub_type               <= slv(sdp_info.fsub_type);
+    exp_sdp_stat_header.app.sdp_source_info_antenna_band_id         <= slv(c_exp_sdp_info.antenna_band_index);
+    exp_sdp_stat_header.app.sdp_source_info_nyquist_zone_id         <=     c_exp_sdp_info.nyquist_zone_index;
+    exp_sdp_stat_header.app.sdp_source_info_f_adc                   <= slv(c_exp_sdp_info.f_adc);
+    exp_sdp_stat_header.app.sdp_source_info_fsub_type               <= slv(c_exp_sdp_info.fsub_type);
     exp_sdp_stat_header.app.sdp_source_info_payload_error           <= TO_UVEC(0, 1);
-    exp_sdp_stat_header.app.sdp_source_info_beam_repositioning_flag <= slv(sdp_info.beam_repositioning_flag);
+    exp_sdp_stat_header.app.sdp_source_info_beam_repositioning_flag <= slv(c_exp_sdp_info.beam_repositioning_flag);
     exp_sdp_stat_header.app.sdp_source_info_subband_calibrated_flag <= slv(subband_calibrated_flag);
     exp_sdp_stat_header.app.sdp_source_info_reserved                <= TO_UVEC(0, 3);
     exp_sdp_stat_header.app.sdp_source_info_gn_id                   <= TO_UVEC(gn_index, 5);
@@ -424,7 +422,7 @@ BEGIN
     exp_sdp_stat_header.app.sdp_nof_signal_inputs                   <= TO_UVEC(          c_nof_signal_inputs,  8);
     exp_sdp_stat_header.app.sdp_nof_bytes_per_statistic             <= TO_UVEC(c_sdp_nof_bytes_per_statistic,  8);
     exp_sdp_stat_header.app.sdp_nof_statistics_per_packet           <= TO_UVEC(  c_nof_statistics_per_packet, 16);
-    exp_sdp_stat_header.app.sdp_block_period                        <= sdp_info.block_period;
+    exp_sdp_stat_header.app.sdp_block_period                        <= c_exp_sdp_info.block_period;
 
     exp_sdp_stat_header.app.dp_bsn <= exp_dp_bsn;
   END PROCESS;
@@ -436,7 +434,7 @@ BEGIN
   BEGIN
     -- Prepare exp_sdp_stat_header before test_offload_sosi.eop, so that it can be verified at test_offload_sosi.eop
     IF test_offload_sosi.eop = '1' THEN
-      v_bool := func_sdp_verify_stat_header(g_statistics_type, rx_sdp_stat_header, exp_sdp_stat_header, sdp_info);
+      v_bool := func_sdp_verify_stat_header(g_statistics_type, rx_sdp_stat_header, exp_sdp_stat_header);
     END IF;
   END PROCESS;
 
@@ -705,7 +703,7 @@ BEGIN
 
     gn_index                => gn_index,
 
-    sdp_info                => sdp_info,
+    sdp_info                => c_exp_sdp_info,
     subband_calibrated_flag => subband_calibrated_flag,
     nof_crosslets           => c_mm_nof_crosslets,
     crosslets_info          => in_crosslets_info_slv