bsc: make BSC_Tests_CBSP module a friend of BSC_Tests

This allows BSC_Tests_CBSP to import friendly API from BSC_Tests.
The line importing stuff from BSC_Tests BSC_Tests_CBSP.ttcn is moved
on top for consistency with an existing friend - BSC_Tests_VAMOS.

Change-Id: Ie0bb5c2e33aadd4858f0f6d001468985c40ab152
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 200fd5b..c2cf8d3 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -21,6 +21,7 @@
  */
 
 friend module BSC_Tests_VAMOS;
+friend module BSC_Tests_CBSP;
 
 import from Misc_Helpers all;
 import from General_Types all;
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index 53f7fbc..e38b8a6 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -12,6 +12,8 @@
  * This test suite tests OsmoBSC while emulating the CBC (Cell Broadcast Centre)
  */
 
+import from BSC_Tests all;
+
 import from General_Types all;
 import from Osmocom_Types all;
 import from GSM_Types all;
@@ -19,8 +21,6 @@
 import from BSSAP_Types all;
 import from BSSMAP_Templates all;
 
-import from BSC_Tests all;
-
 import from IPA_Emulation all;
 import from IPA_CodecPort all;
 import from IPA_Types all;