diff --git a/tests/grib_efas.sh b/tests/grib_efas.sh
index 4124974ca..3c2524188 100755
--- a/tests/grib_efas.sh
+++ b/tests/grib_efas.sh
@@ -48,7 +48,7 @@ grib_check_key_equals $temp2 mars.origin 'ecmf'
 grib_check_key_equals $temp2 mars.model  'lisflood'
 
 ${tools_dir}/grib_set -s \
-    setLocalDefinition=1,localDefinitionNumber=41,type=fc,inputOriginatingCentre=ecmf,typeOfPostProcessing=10 \
+    setLocalDefinition=1,localDefinitionNumber=41,class=ce,type=fc,inputOriginatingCentre=ecmf,typeOfPostProcessing=10 \
     $temp1 $temp2
 grib_check_key_equals $temp2 mars.model  'geff'
 
@@ -60,7 +60,7 @@ ${tools_dir}/grib_set -s paramId=260268 $temp2 $temp3
 grib_check_key_equals $temp3 paramId,lengthOfTimeRange '260268 24'
 
 # Use stepType
-${tools_dir}/grib_set -s localDefinitionNumber=41,stepType=accum $sample $temp1
+${tools_dir}/grib_set -s localDefinitionNumber=41,class=ce,stepType=accum $sample $temp1
 ${tools_dir}/grib_set -s paramId=260267 $temp1 $temp2
 
 # Test anoffset calculation
@@ -72,18 +72,22 @@ grib_check_key_equals $temp1 anoffsetFirst,anoffsetLast,anoffsetFrequency "MISSI
 # MARS step
 types="sfo fu go"
 for t in $types; do
-  ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
+  ${tools_dir}/grib_set -s \
+    setLocalDefinition=1,localDefinitionNumber=41,class=ce,type=$t,stepType=accum,stepRange=12-36 \
   $sample $temp1
-  grib_check_key_equals $temp1 mars.step 36 # end step (ECC-701)
-  grib_check_key_exists $temp1 mars.anoffset
+  ${tools_dir}/grib_set -s paramId=260268 $temp1 $temp2
+  grib_check_key_equals $temp2 mars.step 36 # end step (ECC-701)
+  grib_check_key_exists $temp2 mars.anoffset
   #${tools_dir}/grib_dump -Da $temp1 | grep mars.step
 done
 
 types="fc pf cf"
 for t in $types; do
-  ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
+  ${tools_dir}/grib_set -s \
+    setLocalDefinition=1,localDefinitionNumber=41,class=ce,type=$t,stepType=accum,stepRange=12-36 \
   $sample $temp1
-  grib_check_key_equals $temp1 mars.step 36 # end step
+  ${tools_dir}/grib_set -s paramId=260268 $temp1 $temp2
+  grib_check_key_equals $temp2 mars.step 36 # end step
   #${tools_dir}/grib_dump -Da $temp1 | grep mars.step
 done