diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml
index 1d4f5d7..5221eae 100644
--- a/bsc/expected-results.xml
+++ b/bsc/expected-results.xml
@@ -1,11 +1,28 @@
 <?xml version="1.0"?>
-<testsuite name='BSC_Tests' tests='163' failures='11' errors='1' skipped='0' inconc='0' time='MASKED'>
+<testsuite name='BSC_Tests' tests='209' failures='3' errors='0' skipped='1' inconc='0' time='MASKED'>
   <testcase classname='BSC_Tests' name='TC_ctrl_msc_connection_status' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_ctrl_msc0_connection_status' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_ctrl' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si_default' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_2_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_3_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_4_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_5_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_6_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_12_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_23_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_32_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_33_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_42_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_48_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si2quater_49_earfcns' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si_acc_rotate' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_si_acc_ramp_rotate' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_chan_act_noreply' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_chan_act_counter' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_chan_act_ack_noest' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_chan_act_ack_noest_emerg' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_chan_rqd_emerg_deny' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_chan_act_ack_est_ind_noreply' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_chan_act_ack_est_ind_refused' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_chan_act_nack' time='MASKED'/>
@@ -19,11 +36,13 @@
   <testcase classname='BSC_Tests' name='TC_chan_rel_hard_rlsd_ms_dead' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_chan_rel_a_reset' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_chan_rel_sccp_tiar_timeout' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_chan_rel_rr_cause' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_outbound_connect' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_cic_only' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_csd' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_ctm' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_sign' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_aoip_tla_v6' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_fr_a5_0' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_fr_a5_1' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_fr_a5_1_codec_missing' time='MASKED'/>
@@ -69,6 +88,9 @@
   <testcase classname='BSC_Tests' name='TC_rll_est_ind_inval_sapi1' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_rll_est_ind_inval_sapi3' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_rll_est_ind_inval_sacch' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_rll_rel_ind_sapi_n_reject' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_rll_err_ind_sapi_n_reject' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_rll_timeout_sapi_n_reject' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_paging_imsi_nochan' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_paging_tmsi_nochan' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_paging_tmsi_any' time='MASKED'/>
@@ -95,6 +117,7 @@
   <testcase classname='BSC_Tests' name='TC_rsl_unknown_unit_id' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_oml_unknown_unit_id' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_classmark' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_common_id' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_unsol_ass_fail' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_unsol_ass_compl' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_unsol_ho_fail' time='MASKED'/>
@@ -106,6 +129,7 @@
   <testcase classname='BSC_Tests' name='TC_ho_out_fail_rr_ho_failure' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_ho_out_fail_no_result_after_ho_cmd' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_ho_into_this_bsc' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_ho_into_this_bsc_tla_v6' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_ho_in_fail_msc_clears' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_ho_in_fail_msc_clears_after_ho_detect' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_ho_in_fail_no_detect' time='MASKED'/>
@@ -127,8 +151,32 @@
   <testcase classname='BSC_Tests' name='TC_chopped_ipa_ping' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_chopped_ipa_payload' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_verify_ms_power_params_ie' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_L3Compl_on_1_msc' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_L3Complete_by_imsi_round_robin' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_LU_by_tmsi_null_nri_0_round_robin' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_LU_by_tmsi_null_nri_1_round_robin' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_L3Complete_by_tmsi_unassigned_nri_round_robin' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_L3Complete_by_tmsi_valid_nri_msc_not_connected_round_robin' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_L3Complete_by_tmsi_valid_nri_1' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_L3Complete_by_tmsi_valid_nri_2' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_LU_by_tmsi_from_other_PLMN' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_paging_and_response_imsi' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_paging_and_response_tmsi' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_no_allow_attach_round_robin' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_mscpool_no_allow_attach_valid_nri' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_early_conn_fail' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_late_conn_fail' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_emerg_setup_allow' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_emerg_setup_deny_msc' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_emerg_setup_deny_bts' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_emerg_premption' time='MASKED'>
+    <skipped>no verdict</skipped>
+  </testcase>
+  <testcase classname='BSC_Tests' name='TC_fh_params_chan_activ' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_fh_params_imm_ass' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_fh_params_assignment_cmd' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_fh_params_handover_cmd' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_fh_params_si4_cbch' time='MASKED'/>
   <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_only' time='MASKED'/>
   <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_bway_connect' time='MASKED'/>
   <testcase classname='BSC_Tests_LCLS' name='TC_lcls_gcr_bway_connect_hr' time='MASKED'/>
@@ -143,81 +191,24 @@
   <testcase classname='BSC_Tests_LCLS' name='TC_lcls_bts_gcr_bway_connect' time='MASKED'/>
   <testcase classname='BSC_Tests_LCLS' name='TC_lcls_bts_gcr_bway_connect_hr' time='MASKED'/>
   <testcase classname='BSC_Tests_LCLS' name='TC_lcls_bts_connect_break' time='MASKED'/>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_bsc_server' time='MASKED'>
-    <failure type='fail-verdict'>Could not connect to CBSP port, check your configuration
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_bsc_server testcase
-    </failure>
-  </testcase>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_bsc_server' time='MASKED'/>
   <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_bsc_client' time='MASKED'/>
   <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_reset_bss' time='MASKED'/>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_bss' time='MASKED'>
-    <failure type='fail-verdict'>Received unexpected CBSP
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_write_bss testcase
-    </failure>
-  </testcase>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_bts_cgi' time='MASKED'>
-    <failure type='fail-verdict'>Received unexpected CBSP
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_write_bts_cgi testcase
-    </failure>
-  </testcase>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_bss' time='MASKED'/>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_bts_cgi' time='MASKED'/>
   <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_bts_no_cbch' time='MASKED'/>
   <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_unknown_bts' time='MASKED'/>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_lac_ci' time='MASKED'>
-    <failure type='fail-verdict'>Received unexpected CBSP
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_write_lac_ci testcase
-    </failure>
-  </testcase>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_ci' time='MASKED'>
-    <failure type='fail-verdict'>Received unexpected CBSP
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_write_ci testcase
-    </failure>
-  </testcase>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_lai' time='MASKED'>
-    <failure type='fail-verdict'>Received unexpected CBSP
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_write_lai testcase
-    </failure>
-  </testcase>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_lac' time='MASKED'>
-    <failure type='fail-verdict'>Received unexpected CBSP
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_write_lac testcase
-    </failure>
-  </testcase>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_then_replace' time='MASKED'>
-    <failure type='fail-verdict'>Received unexpected CBSP
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_write_then_replace testcase
-    </failure>
-  </testcase>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_lac_ci' time='MASKED'/>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_ci' time='MASKED'/>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_lai' time='MASKED'/>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_lac' time='MASKED'/>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_then_replace' time='MASKED'/>
   <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_replace_nonexist' time='MASKED'/>
   <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_too_many' time='MASKED'/>
   <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_kill_nonexist' time='MASKED'/>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_then_kill' time='MASKED'>
-    <error type='DTE'>Dynamic test case error: Performing lengthof() operation on a template of type @CBSP_Types.CBSP_IEs with no exact length.</error>
-  </testcase>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_then_reset' time='MASKED'>
-    <failure type='fail-verdict'>Received unexpected CBSP
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_write_then_reset testcase
-    </failure>
-  </testcase>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_then_kill' time='MASKED'/>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_write_then_reset' time='MASKED'/>
   <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_emerg_write_bts_cgi_dchan' time='MASKED'/>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_emerg_write_bts_cgi_cchan' time='MASKED'>
-    <failure type='fail-verdict'>Received unexpected OSMO_ETWS_CMD
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_emerg_write_bts_cgi_cchan testcase
-    </failure>
-  </testcase>
-  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_emerg_write_bts_cgi_cchan_disable' time='MASKED'>
-    <failure type='fail-verdict'>Received unexpected OSMO_ETWS_CMD
-      BSC_Tests_CBSP.ttcn:MASKED BSC_Tests_CBSP control part
-      BSC_Tests_CBSP.ttcn:MASKED TC_cbsp_emerg_write_bts_cgi_cchan_disable testcase
-    </failure>
-  </testcase>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_emerg_write_bts_cgi_cchan' time='MASKED'/>
+  <testcase classname='BSC_Tests_CBSP' name='TC_cbsp_emerg_write_bts_cgi_cchan_disable' time='MASKED'/>
 </testsuite>