diff --git a/boards/uniboard1/designs/unb1_test/hdllib.cfg b/boards/uniboard1/designs/unb1_test/hdllib.cfg
index f96ff3657508d1b36db11e94091a2133889d80a1..5e3b415a7a878e1ef6a27a83d8525dda64005750 100644
--- a/boards/uniboard1/designs/unb1_test/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/hdllib.cfg
@@ -1,6 +1,6 @@
 hdl_lib_name = unb1_test
 hdl_library_clause_name = unb1_test_lib
-hdl_lib_uses = common mm i2c unb1_board remu epcs dp tse tr_xaui tr_10GbE mdio diagnostics
+hdl_lib_uses = common mm i2c unb1_board remu epcs dp eth tr_xaui tr_10GbE mdio diagnostics
 hdl_lib_technology = ip_stratixiv
 
 build_sim_dir = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd b/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd
index d478d54a3722becf1046433b9c4f278b2ce1b71f..4cbae1749ffba6a5599459dcc1e3fbac73266f31 100644
--- a/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd
+++ b/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd
@@ -19,20 +19,17 @@
 --
 -------------------------------------------------------------------------------
 
-LIBRARY IEEE, common_lib, unb1_board_lib, mm_lib, remu_lib, epcs_lib, eth_lib, tse_lib;
+LIBRARY IEEE, common_lib, unb1_board_lib, mm_lib, remu_lib, epcs_lib, eth_lib;
 USE IEEE.STD_LOGIC_1164.ALL;
 USE IEEE.NUMERIC_STD.ALL;
 USE common_lib.common_pkg.ALL;
 USE common_lib.common_mem_pkg.ALL;
+USE common_lib.common_field_pkg.ALL;
+USE common_lib.common_network_total_header_pkg.ALL;
 USE unb1_board_lib.unb1_board_pkg.ALL;
 USE unb1_board_lib.unb1_board_peripherals_pkg.ALL;
 USE mm_lib.mm_file_pkg.ALL;
 USE mm_lib.mm_file_unb_pkg.ALL;
-USE tse_lib.tse_pkg.ALL;
-USE tse_lib.tb_tse_pkg.ALL;
-USE tse_lib.eth_pkg.ALL;
-USE tse_lib.eth_layers_pkg.ALL;
-USE common_lib.common_field_pkg.ALL;
 
 
 ENTITY mmm_unb1_test IS
@@ -143,8 +140,12 @@ ARCHITECTURE str OF mmm_unb1_test IS
   CONSTANT c_dp_reg_mm_nof_words       : NATURAL := 1;
   CONSTANT c_dp_reg_mm_adr_w           : NATURAL := ceil_log2(nof_bf_units * pow2(ceil_log2(c_dp_reg_mm_nof_words)));
 
-  CONSTANT c_hdr_nof_words             : NATURAL := c_eth_total_header_nof_words;
-  CONSTANT c_dp_ram_mm_nof_words       : NATURAL := c_hdr_nof_words * (c_tse_data_w/c_word_w);
+  --CONSTANT c_hdr_nof_words             : NATURAL := c_eth_total_header_nof_words;
+  CONSTANT c_hdr_nof_words             : NATURAL := (c_network_total_header_len + c_network_total_header_32b_align_len)/4;
+
+  --CONSTANT c_dp_ram_mm_nof_words       : NATURAL := c_hdr_nof_words * (c_tse_data_w/c_word_w);
+  CONSTANT c_dp_ram_mm_nof_words       : NATURAL := c_hdr_nof_words * (c_word_w/c_word_w);
+
   CONSTANT c_dp_ram_mm_adr_w           : NATURAL := ceil_log2(nof_bf_units * c_dp_ram_mm_nof_words);
 
 
diff --git a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd
index 72771cba74bbc95cda6298d3625894c846e68268..a081ee367ac8b8c3f3edea52a69c563dfffa1de6 100644
--- a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd
+++ b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd
@@ -20,16 +20,13 @@
 --
 -------------------------------------------------------------------------------
 
-LIBRARY IEEE, common_lib, unb1_board_lib, remu_lib, epcs_lib, dp_lib, tse_lib, tr_xaui_lib, tr_10GbE_lib;
+LIBRARY IEEE, common_lib, unb1_board_lib, remu_lib, epcs_lib, dp_lib, eth_lib, tr_xaui_lib, tr_10GbE_lib;
 USE IEEE.STD_LOGIC_1164.ALL;
 USE IEEE.NUMERIC_STD.ALL;
 USE common_lib.common_pkg.ALL;
 USE common_lib.common_mem_pkg.ALL;
 USE unb1_board_lib.unb1_board_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE tse_lib.tse_pkg.ALL;
-USE tse_lib.eth_pkg.ALL;
-USE tse_lib.eth_layers_pkg.ALL;
 USE tr_xaui_lib.tr_xaui_pkg.ALL;