diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn
index b8eb471..fa7be47 100644
--- a/pgw/PGW_Tests.ttcn
+++ b/pgw/PGW_Tests.ttcn
@@ -41,7 +41,7 @@
 }
 
 /* main component, we typically have one per testcase */
-type component PGW_Test_CT {
+type component PGW_Test_CT extends GTP2_ConnHdlr {
 	var GTPv2_Emulation_CT vc_GTP2;
 	port GTP2EM_PT TEID0;
 
@@ -241,6 +241,8 @@
 	vc_GTP2 := GTPv2_Emulation_CT.create("GTP2_EM");
 	map(vc_GTP2:GTP2C, system:GTP2C);
 	connect(vc_GTP2:TEID0, self:TEID0);
+	connect(vc_GTP2:CLIENT, self:GTP2);
+	connect(vc_GTP2:CLIENT_PROC, self:GTP2_PROC);
 	vc_GTP2.start(GTPv2_Emulation.main(cfg));
 
 	if (mp_pcrf_local_ip != "") {
@@ -785,10 +787,10 @@
 
 	f_init();
 
-	TEID0.send(ts_GTP2C_EchoReq(0));
+	GTP2.send(ts_GTP2C_EchoReq(0));
 	T.start;
 	alt {
-	[] TEID0.receive(tr_GTP2C_EchoResp) {
+	[] GTP2.receive(tr_GTP2C_EchoResp) {
 		setverdict(pass);
 		}
 	[] T.timeout {