diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 13edca5..e2d5fb2 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -550,8 +550,7 @@
 						tr_AVP_MultipleServicesIndicator,
 						tr_AVP_Multiple_Services_Credit_Control(content := superset(
 							tr_AVP_Requested_Service_Unit,
-							tr_AVP_PCC_3GPP_QoS_Information,
-							tr_AVP_GI_3GPP_RatType(rat_type)
+							tr_AVP_PCC_3GPP_QoS_Information
 						)),
 						tr_AVP_3GPP_ServiceInformation(content := superset(
 							tr_AVP_3GPP_PSInformation(content := superset(
@@ -567,6 +566,7 @@
 								tr_AVP_3GPP_NSAPI(nsapi),
 								tr_AVP_3GPP_MS_TimeZone,
 								tr_AVP_3GPP_ULI,
+								tr_AVP_GI_3GPP_RatType(rat_type),
 								tr_AVP_UserEquipmentInfo({
 									tr_AVP_UserEquipmentInfoType(IMEISV),
 									tr_AVP_UserEquipmentInfoValue(imeisv)
@@ -596,8 +596,7 @@
 							tr_AVP_Requested_Service_Unit,
 							tr_AVP_Used_Service_Unit,
 							/* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */
-							tr_AVP_PCC_3GPP_QoS_Information,
-							tr_AVP_GI_3GPP_RatType(rat_type)
+							tr_AVP_PCC_3GPP_QoS_Information
 						)),
 						tr_AVP_3GPP_ServiceInformation(content := superset(
 							tr_AVP_3GPP_PSInformation(content := superset(
@@ -613,6 +612,7 @@
 								tr_AVP_3GPP_NSAPI(nsapi),
 								tr_AVP_3GPP_MS_TimeZone,
 								tr_AVP_3GPP_ULI,
+								tr_AVP_GI_3GPP_RatType(rat_type),
 								tr_AVP_UserEquipmentInfo({
 									tr_AVP_UserEquipmentInfoType(IMEISV),
 									tr_AVP_UserEquipmentInfoValue(imeisv)
@@ -643,8 +643,7 @@
 							/* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */
 							tr_AVP_Used_Service_Unit,
 							tr_AVP_3GPP_Reporting_Reason(FINAL),
-							tr_AVP_PCC_3GPP_QoS_Information,
-							tr_AVP_GI_3GPP_RatType(rat_type)
+							tr_AVP_PCC_3GPP_QoS_Information
 						)),
 						tr_AVP_3GPP_ServiceInformation(content := superset(
 							tr_AVP_3GPP_PSInformation(content := superset(
@@ -660,6 +659,7 @@
 								tr_AVP_3GPP_NSAPI(nsapi),
 								tr_AVP_3GPP_MS_TimeZone,
 								tr_AVP_3GPP_ULI,
+								tr_AVP_GI_3GPP_RatType(rat_type),
 								tr_AVP_UserEquipmentInfo({
 									tr_AVP_UserEquipmentInfoType(IMEISV),
 									tr_AVP_UserEquipmentInfoValue(imeisv)