SGSN_Tests: f_detach_mo(): fail when receiving any unhandled layer 3 message for normal detach

Merge the case with the fail when doing a power-off detach.

Change-Id: I957994376583959758417dccf419a55c43a0c61b
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 1f63dfa..03c9d05 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -924,10 +924,6 @@
 		mtc.stop;
 		/* TODO: check if any PDP contexts are deactivated on network side? */
 		}
-	[power_off] BSSGP[bssgp_index].receive(tr_BD_L3_MT(?)) -> value bd {
-		setverdict(fail, "Unexpected Layer 3 package received in power-off DETACH");
-		mtc.stop;
-		}
 	[power_off] T.timeout {
 		setverdict(pass);
 		}
@@ -936,6 +932,14 @@
 		setverdict(pass);
 		/* TODO: check if any PDP contexts are deactivated on network side? */
 		}
+	[] BSSGP[bssgp_index].receive(tr_BD_L3_MT(?)) -> value bd {
+		if (power_off) {
+			setverdict(fail, "Unexpected Layer 3 package received in power-off DETACH");
+		} else {
+			setverdict(fail, "Unexpected Layer 3 package received in normal DETACH");
+		}
+		mtc.stop;
+		}
 	[] BSSGP[bssgp_index].receive { repeat; }
 	}
 }