diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index f9697a1..234d910 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -902,7 +902,10 @@
 		f_shutdown(__BFILE__, __LINE__);
 	}
 
-	/* TODO: check exp_cs */
+	if (not match(data_block.cs, exp_cs)) {
+		setverdict(fail, "Failed to match ", data_block.cs, " vs exp ", exp_cs);
+		f_shutdown(__BFILE__, __LINE__);
+	}
 }
 
 /* This function does what could probably be done with templates */
@@ -934,8 +937,10 @@
 		f_shutdown(__BFILE__, __LINE__);
 	}
 
-	/* TODO: Check exp_cs. In the case of EGPRS, first check mac_hdr.header_type and then decode CPS = exp_cs based on mac_hdr.header_type.
-		See wireshark's egprs_Header_type1_coding_puncturing_scheme_to_mcs. */
+	if (not match(data_block.mcs, exp_cs)) {
+		setverdict(fail, "Failed to match ", data_block.mcs, " vs exp ", exp_cs);
+		f_shutdown(__BFILE__, __LINE__);
+	}
 }
 
 /* High level (task specific) helper for receiving and matching GPRS/EGPRS data blocks */