diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml
index e266660..1d4f5d7 100644
--- a/bsc/expected-results.xml
+++ b/bsc/expected-results.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
-<testsuite name='BSC_Tests' tests='107' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'>
+<testsuite name='BSC_Tests' tests='163' failures='11' errors='1' skipped='0' 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_ctrl_location' 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'/>
@@ -38,6 +37,23 @@
   <testcase classname='BSC_Tests' name='TC_assignment_codec_efr' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S1' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S1' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S124' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S124' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S0' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S02' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S024' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S0247' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S0' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S02' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S024' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S0247' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S01234567' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S0234567' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_zero' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_unsupp' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S7' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_codec_fr_exhausted_req_hr' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_codec_fr_exhausted_req_fr' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_assignment_codec_fr_exhausted_req_fr_hr' time='MASKED'/>
@@ -94,6 +110,13 @@
   <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'/>
   <testcase classname='BSC_Tests' name='TC_ho_in_fail_no_detect2' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_ho_neighbor_config_1' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_ho_neighbor_config_2' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_ho_neighbor_config_3' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_ho_neighbor_config_4' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_ho_neighbor_config_5' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_ho_neighbor_config_6' time='MASKED'/>
+  <testcase classname='BSC_Tests' name='TC_ho_neighbor_config_7' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_bssap_rlsd_does_not_cause_bssmap_reset' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_bssmap_clear_does_not_cause_bssmap_reset' time='MASKED'/>
   <testcase classname='BSC_Tests' name='TC_ms_rel_ind_does_not_cause_bssmap_reset' time='MASKED'/>
@@ -106,23 +129,6 @@
   <testcase classname='BSC_Tests' name='TC_assignment_verify_ms_power_params_ie' 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_codec_amr_f_S1' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S1' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S124' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S124' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S0' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S02' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S024' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S0247' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S0' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S02' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S024' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S0247' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S01234567' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S0234567' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_zero' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_unsupp' time='MASKED'/>
-  <testcase classname='BSC_Tests' name='TC_assignment_codec_amr_h_S7' 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'/>
@@ -137,4 +143,81 @@
   <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_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_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_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_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>
 </testsuite>