diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn
index 8a25ebf..adae0a4 100644
--- a/pgw/PGW_Tests.ttcn
+++ b/pgw/PGW_Tests.ttcn
@@ -632,17 +632,20 @@
 				process_bctx_create(bctx);
 				}
 			case ('0001'B) { // removed
-				setverdict(fail, "We don't expect removed bearer contexts yet");
+				Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+							"We don't expect removed bearer contexts yet");
 				}
 			}
 		}
 		}
 	[] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid:=g_teic, cause:=?)) -> value rx {
-		setverdict(fail, "Unexpected  CreateSessionResp(cause=",
-				rx.gtpcv2_pdu.createSessionResponse.cause.causeValue, ")");
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+					log2str("Unexpected  CreateSessionResp(cause=",
+						rx.gtpcv2_pdu.createSessionResponse.cause.causeValue, ")"));
 		}
 	[] GTP2.receive {
-		setverdict(fail, "Unexpected GTPv2 while waiting for CreateSessionResp");
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+					"Unexpected GTPv2 while waiting for CreateSessionResp");
 		}
 	}
 
@@ -673,10 +676,12 @@
 		setverdict(pass);
 		}
 	[] GTP2.receive(tr_GTP2C_DeleteSessionResp(?, ?)) {
-		setverdict(fail, "Unexpected  DeleteSessionResp");
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+					"Unexpected  DeleteSessionResp");
 		}
 	[] GTP2.receive {
-		setverdict(fail, "Unexpected GTPv2 while waiting for DeleteSessionResp");
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+					"Unexpected GTPv2 while waiting for DeleteSessionResp");
 		}
 	}
 
@@ -712,7 +717,8 @@
 	log("Starting a program: ", command);
 	var UECUPS_StartProgramRes res := f_gtp2_start_program(sprog);
 	if (res.result != OK) {
-		setverdict(fail, "Unable to start program '", command, "'");
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+					log2str("Unable to start program '", command, "'"));
 	}
 	return res.pid;
 }
@@ -730,10 +736,12 @@
 		setverdict(pass);
 		}
 	[] GTP2.receive(UECUPS_ProgramTermInd:?) -> value pti {
-		setverdict(fail, "Received unexpected ProgramTermInd := ", pti);
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+					log2str("Received unexpected ProgramTermInd := ", pti));
 		}
 	[] T.timeout {
-		setverdict(fail, "timeout waiting for user-plane program termination");
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+					"timeout waiting for user-plane program termination");
 		}
 	}
 }
@@ -778,7 +786,7 @@
 		setverdict(pass);
 		}
 	[] T.timeout {
-		setverdict(fail, "timeout waiting for Echo Response");
+		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "timeout waiting for Echo Response");
 		}
 	}
 }