diff --git a/.Rbuildignore b/.Rbuildignore
index 98316ccfd13a0286857a3ce70b87bc08517f8cb6..d79d3e82545358eb4f0d2d60205fabcd8eb6014a 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -9,11 +9,12 @@
 ^inst/doc$
 ^\.gitlab-ci\.yml$
 ## unit tests should be ignored when building the package for CRAN
-#^tests$
+^tests$
 ^inst/PlotProfiling\.R$
 ^.gitlab$
 # Suggested by http://r-pkgs.had.co.nz/package.html
 ^.*\.Rproj$         # Automatically added by RStudio,
 ^\.Rproj\.user$     # used for temporary files. 
 ^cran-comments\.md$ # Comments for CRAN submission
+^CONTRIBUTING\.md$
 #^NEWS\.md$          # A news file written in Markdown
diff --git a/R/ByChunks_autosubmit.R b/R/ByChunks_autosubmit.R
index bf63878d861ab1c77f9f1f16073be9052d83cb34..dc0e2e93f9c01a372c50474838b69e600cae2bcd 100644
--- a/R/ByChunks_autosubmit.R
+++ b/R/ByChunks_autosubmit.R
@@ -236,10 +236,10 @@ ByChunks_autosubmit <- function(step_fun, cube_headers, ..., chunks = 'auto',
   cluster <- default_cluster
 
   ### queue_host 
-  support_hpcs <- c('local', 'nord3', 'nord4') # names in platforms.yml
+  support_hpcs <- c('local', 'nord3', 'nord4', 'mn5', 'amd') # names in platforms.yml
   if (is.null(cluster$queue_host) || !cluster$queue_host %in% support_hpcs) {
     stop("Cluster component 'queue_host' must be one of the following: ", 
-         paste(support_hpcs, collapse = ','), '.')
+         paste(support_hpcs, collapse = ', '), '.')
   }
 
   ### data_dir