diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index 82a2375..becf2e9 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -585,10 +585,14 @@
 	setverdict(pass);
 }
 
-private function f_TC_authinfo_normal(charstring id) runs on EPDG_ConnHdlr {
+private function f_initial_attach() runs on EPDG_ConnHdlr {
 	f_GSUP_AI_success();
 	f_GSUP_LU_success();
 	f_GSUP_EPDGTunnel_success();
+}
+
+private function f_TC_authinfo_normal(charstring id) runs on EPDG_ConnHdlr {
+	f_initial_attach();
 	f_GSUP_PurgeMS_success();
 }
 
@@ -602,7 +606,7 @@
 }
 
 private function f_TC_ho_wifi_to_lte(charstring id) runs on EPDG_ConnHdlr {
-	f_TC_authinfo_normal(id);
+	f_initial_attach();
 	/* Whenever UE goes back to 3GPP, PGW will notify ePDG with a Delete Bearer Request
 	 * cause="Access changed from non-3gpp to 3gpp" */
 	f_GTP2C_DeleteBearer_success();