diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3e2904606f..1e2a9d0412e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -283,7 +283,7 @@ TB-vivado-hls-build:
 TM-vivado-hls-build:
   <<: *template_hls-build
   needs: ["download", "TM-quality-check"]
-  allow_failure: true # remove after regenerating test vectors
+  allow_failure: false # FIXME: testbench currently always passes
   variables:
     EXECUTABLE: 'vivado_hls'
     VIVADO_VERSION: "2019.2"
diff --git a/emData/download.sh b/emData/download.sh
index ec4ea61c65e..77b29bc34e5 100755
--- a/emData/download.sh
+++ b/emData/download.sh
@@ -307,7 +307,7 @@ do
 
 # Create a list of all processing modules. The VMRs in the combined config get
 # a special name.
-processing_modules=`sed "s/VMRouterCM: VMR/&CM/g" LUTs/processingmodules.dat LUTsCM/processingmodules.dat LUTsReduced/processingmodules.dat LUTsBarrel/processingmodules.dat | awk '{print $2}' | sort -u | grep ${module_type}_`
+processing_modules=`sed "s/VMRouterCM: VMR/&CM/g" LUTs/processingmodules.dat LUTsCM/processingmodules.dat LUTsReduced/processingmodules.dat LUTsBarrel/processingmodules.dat | awk '{print $2}' | sort -u | grep ${module_type}`
 
 # For each of the desired modules, create a dedicated directory with symbolic
 # links to the associated test-bench files.