diff --git a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/model_handling.py b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/model_handling.py
index 9d1ea08142..803fa5e258 100644
--- a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/model_handling.py
+++ b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/model_handling.py
@@ -746,6 +746,7 @@ def write_hardcoded_parameters(self, params):
         res = res.replace(' ;',';')
         res = res.replace('= - ','= -') # post-fix for susy
         res = res.replace('(  - ','( -') # post-fix for susy
+        res = res.replace(',  - ',', -') # post-fix for SM no_b_mass
         ###print(res); assert(False)
         return res
 
diff --git a/epochX/cudacpp/CODEGEN/generateAndCompare.sh b/epochX/cudacpp/CODEGEN/generateAndCompare.sh
index 38c971832a..463b155515 100755
--- a/epochX/cudacpp/CODEGEN/generateAndCompare.sh
+++ b/epochX/cudacpp/CODEGEN/generateAndCompare.sh
@@ -44,6 +44,19 @@ function codeGenAndDiff()
     pp_tttt)
       cmd="generate p p > t t~ t t~"
       ;;
+    pp_ttW) # TEMPORARY! until no_b_mass #695 and/or #696 are fixed
+      cmd="define p = p b b~
+      define j = p
+      define w = w+ w- # W case only
+      generate p p > t t~ w @0
+      add process p p > t t~ w j @1"
+      ;;
+    pp_ttZ) # TEMPORARY! until no_b_mass #695 and/or #696 are fixed
+      cmd="define p = p b b~
+      define j = p
+      generate p p > t t~ z @0
+      add process p p > t t~ z j @1"
+      ;;
     uu_tt)
       cmd="generate u u~ > t t~"
       ;;
@@ -53,6 +66,21 @@ function codeGenAndDiff()
     bb_tt)
       cmd="generate b b~ > t t~"
       ;;
+    nobm_pp_ttW)
+      cmd="import model loop_sm-no_b_mass
+      define p = p b b~
+      define j = p
+      define w = w+ w- # W case only
+      generate p p > t t~ w @0
+      add process p p > t t~ w j @1"
+      ;;
+    nobm_pp_ttZ)
+      cmd="import model loop_sm-no_b_mass
+      define p = p b b~
+      define j = p
+      generate p p > t t~ z @0
+      add process p p > t t~ z j @1"
+      ;;
     heft_gg_h)
       cmd="set auto_convert_model T; import model heft; generate g g > h"
       ;;