diff --git a/test/Demo_Bright_Ascension/DataView.aadl b/test/Demo_Bright_Ascension/DataView.aadl
index 1ae484af06864732b2477fc041eb2d983b6487bd..cf8bafb727182459406e2f50416ebddd3417e851 100644
--- a/test/Demo_Bright_Ascension/DataView.aadl
+++ b/test/Demo_Bright_Ascension/DataView.aadl
@@ -2,7 +2,7 @@
 --! File generated by asn2aadl v2.1.39: DO NOT EDIT !
 --------------------------------------------------------
 --! InputASN1FileChecksum:a57f03badf9d0834d70b233ec63db44f:/home/taste/tool-src/kazoo/test/Demo_Bright_Ascension/DataView.asn:
---! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:/home/taste/tool-inst/share/taste-types/taste-types.asn:
+--! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:/home/taste/tool-src/kazoo/test/common/taste-types.asn:
 --------------------------------------------------------
 
 package DataView
@@ -43,7 +43,7 @@ end Stream_Element_Buffer;
 DATA T_Boolean
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/common/taste-types.asn");
     TASTE::Ada_Package_Name => "TASTE_BasicTypes";
     Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
     Source_Language => (ASN1);
@@ -272,7 +272,7 @@ END T_InstanceBooleanPairList_Buffer.impl;
 DATA T_Int32
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/common/taste-types.asn");
     TASTE::Ada_Package_Name => "TASTE_BasicTypes";
     Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
     Source_Language => (ASN1);
@@ -455,7 +455,7 @@ END T_Int64_Buffer.impl;
 DATA T_Int8
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/common/taste-types.asn");
     TASTE::Ada_Package_Name => "TASTE_BasicTypes";
     Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
     Source_Language => (ASN1);
@@ -4686,7 +4686,7 @@ END T_UInt16_Buffer.impl;
 DATA T_UInt32
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/common/taste-types.asn");
     TASTE::Ada_Package_Name => "TASTE_BasicTypes";
     Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
     Source_Language => (ASN1);
@@ -4777,7 +4777,7 @@ END T_UInt32List_Buffer.impl;
 DATA T_UInt8
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/common/taste-types.asn");
     TASTE::Ada_Package_Name => "TASTE_BasicTypes";
     Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
     Source_Language => (ASN1);
diff --git a/test/Demo_Bright_Ascension/Makefile b/test/Demo_Bright_Ascension/Makefile
index 15fc492228748163acab9269714bcdc0f97ae80e..e81ae0e1e2b9a4f791b9cd7ff2a45195c4330100 100644
--- a/test/Demo_Bright_Ascension/Makefile
+++ b/test/Demo_Bright_Ascension/Makefile
@@ -3,6 +3,41 @@ KAZOO=../../kazoo
 all: c
 
 c: test-parse-c # Polyorb_HI_C output
+	cp action_service_adapter/action_service_adapter.c work/action_service_adapter/C/src
+	cp action_service_dispatch/action_service_dispatch.c work/action_service_dispatch/C/src
+	cp aggregation_service_adapter/aggregation_service_adapter.c work/aggregation_service_adapter/C/src
+	cp aggregation_service_dispatch/aggregation_service_dispatch.c work/aggregation_service_dispatch/C/src
+	cp aggregation_service_provider/aggregation_service_provider.c work/aggregation_service_provider/C/src
+	cp alert_service_adapter/alert_service_adapter.c work/alert_service_adapter/C/src
+	cp alert_service_dispatch/alert_service_dispatch.c work/alert_service_dispatch/C/src
+	cp check_service_adapter/check_service_adapter.c work/check_service_adapter/C/src
+	cp check_service_dispatch/check_service_dispatch.c work/check_service_dispatch/C/src
+	cp check_service_provider/check_service_provider.c work/check_service_provider/C/src
+	#cp gyro_device/gyro_device.c work/gyro_device/C/src
+	cp gyro_device_access/gyro_device_access.c work/gyro_device_access/C/src
+	#cp gyro_device_accesss/gyro_device_accesss.c work/gyro_device_accesss/C/src
+	cp mal_dispatch/mal_dispatch.c work/mal_dispatch/C/src
+	cp mal_space_packet_binding/mal_space_packet_binding.c work/mal_space_packet_binding/C/src
+	cp mode_control_service_adapter/mode_control_service_adapter.c work/mode_control_service_adapter/C/src
+	cp mode_control_service_dispatch/mode_control_service_dispatch.c work/mode_control_service_dispatch/C/src
+	cp mode_manager/mode_manager.c work/mode_manager/C/src
+	cp mode_manager_container/mode_manager_container.c work/mode_manager_container/C/src
+	cp parameter_service_adapter/parameter_service_adapter.c work/parameter_service_adapter/C/src
+	cp parameter_service_dispatch/parameter_service_dispatch.c work/parameter_service_dispatch/C/src
+	cp pus_custom_service_protocol_handler/pus_custom_service_protocol_handler.c work/pus_custom_service_protocol_handler/C/src
+	cp pus_housekeeping_service_protocol_handler/pus_housekeeping_service_protocol_handler.c work/pus_housekeeping_service_protocol_handler/C/src
+	cp pus_parameter_service_handler/pus_parameter_service_handler.c work/pus_parameter_service_handler/C/src
+	cp pus_protocol_handling/pus_protocol_handling.c work/pus_protocol_handling/C/src
+	cp pus_service_dispatch/pus_service_dispatch.c work/pus_service_dispatch/C/src
+	#cp pus_spp_handling/pus_spp_handling.c work/pus_spp_handling/C/src
+	#cp space_link_rx/space_link_rx.c work/space_link_rx/C/src
+	#cp space_link_tx/space_link_tx.c work/space_link_tx/C/src
+	#cp space_packet_routing/space_packet_routing.c work/space_packet_routing/C/src
+	#cp spp_packet_service/spp_packet_service.c work/spp_packet_service/C/src
+	cp thermal_manager/thermal_manager.c work/thermal_manager/C/src
+	cp thermal_manager_container/thermal_manager_container.c work/thermal_manager_container/C/src
+	cp virtual_gyro_container/virtual_gyro_container.c work/virtual_gyro_container/C/src
+	cp virtual_gyro_device/virtual_gyro_device.c work/virtual_gyro_device/C/src
 	$(MAKE) -C work
 
 test-parse-c: clean-c
diff --git a/test/Demo_Bright_Ascension/pus_custom_service_protocol_handler/pus_custom_service_protocol_handler.c b/test/Demo_Bright_Ascension/pus_custom_service_protocol_handler/pus_custom_service_protocol_handler.c
index dbe39f802fd6c8d628ae3bb635698ee5f06c83bb..8407fbfc4e2558b572b6c600bc303fbdc4fafe75 100644
--- a/test/Demo_Bright_Ascension/pus_custom_service_protocol_handler/pus_custom_service_protocol_handler.c
+++ b/test/Demo_Bright_Ascension/pus_custom_service_protocol_handler/pus_custom_service_protocol_handler.c
@@ -9,7 +9,7 @@
 // APID for mode control service instance provided by mode manager component
 #define MODE_MANAGER_PROVIDER_ID 99
 
-const asn1SccT_apid applicationID = 2043;
+static const asn1SccT_apid applicationID = 2043;
 
 void pus_custom_service_protocol_handler_startup()
 {
diff --git a/test/Demo_Bright_Ascension/pus_parameter_service_handler/pus_parameter_service_handler.c b/test/Demo_Bright_Ascension/pus_parameter_service_handler/pus_parameter_service_handler.c
index 18352ed1a1db05fd40de93ea77f2bed20ffa29c6..fc1f0d7443d6bbda6d97f0ee9b1a3d73a2d05164 100644
--- a/test/Demo_Bright_Ascension/pus_parameter_service_handler/pus_parameter_service_handler.c
+++ b/test/Demo_Bright_Ascension/pus_parameter_service_handler/pus_parameter_service_handler.c
@@ -9,7 +9,7 @@
 // APID for parameter service instance provided by mode manager component
 #define MODE_MANAGER_PROVIDER_ID 101
 
-const asn1SccT_apid applicationID = 2044;
+static const asn1SccT_apid applicationID = 2044;
 
 void pus_parameter_service_handler_startup()
 {