diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d86553d..07aefec6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,10 @@
-image: jangorecki/r-base-dev
+# from https://stackoverflow.com/questions/51866926
+image: rocker/r-base
 test:
-  script:
+   script:
+    - apt-get update
+    - apt-get install --yes --no-install-recommends r-cran-testthat r-cran-devtools
+    - R -e "devtools::install_deps()"
     - R CMD build . --no-build-vignettes --no-manual
     - PKG_FILE_NAME=$(ls -1t *.tar.gz | head -n 1)
-    - R CMD check "${PKG_FILE_NAME}" --no-build-vignettes --no-manual --as-cran 
\ No newline at end of file
+    - R CMD check "${PKG_FILE_NAME}" --no-build-vignettes --no-manual
diff --git a/R/globals.R b/R/globals.R
index 8873099a..60b73e8d 100755
--- a/R/globals.R
+++ b/R/globals.R
@@ -58,6 +58,7 @@ globalVariables(c(".",
                   "Pasted",
                   "patient_id",
                   "prevalence",
+                  "psae",
                   "R",
                   "ref",
                   "real_first_isolate",
diff --git a/R/mdro.R b/R/mdro.R
index 07480a05..3a723a1f 100755
--- a/R/mdro.R
+++ b/R/mdro.R
@@ -329,11 +329,6 @@ MDRO <- function(tbl,
       & rowSums(tbl[, aminoglycosides] == 'R', na.rm = TRUE) >= 1
       & rowSums(tbl[, fluoroquinolones] == 'R', na.rm = TRUE) >= 1
     ), 'MDRO'] <- 4
-    a <<- tbl[which(
-      tbl$family == 'Enterobacteriaceae'
-      & rowSums(tbl[, aminoglycosides] == 'R', na.rm = TRUE) >= 1
-      & rowSums(tbl[, fluoroquinolones] == 'R', na.rm = TRUE) >= 1
-    ), ]
     tbl[which(
       tbl$family == 'Enterobacteriaceae'
       & rowSums(tbl[, carbapenems] == 'R', na.rm = TRUE) >= 1
diff --git a/R/resistance_predict.R b/R/resistance_predict.R
index 3890b90b..da0ce702 100644
--- a/R/resistance_predict.R
+++ b/R/resistance_predict.R
@@ -67,13 +67,7 @@
 #'   # get bacteria properties like genus and species
 #'   left_join_microorganisms("mo") %>%
 #'   # calculate first isolates
-#'   mutate(first_isolate =
-#'            first_isolate(.,
-#'                          "date",
-#'                          "patient_id",
-#'                          "mo",
-#'                          col_specimen = NA,
-#'                          col_icu = NA)) %>%
+#'   mutate(first_isolate = first_isolate(.)) %>%
 #'   # filter on first E. coli isolates
 #'   filter(genus == "Escherichia",
 #'          species == "coli",
diff --git a/man/MDRO.Rd b/man/MDRO.Rd
index 321aad99..2a4915fc 100755
--- a/man/MDRO.Rd
+++ b/man/MDRO.Rd
@@ -7,7 +7,7 @@
 \alias{EUCAST_exceptional_phenotypes}
 \title{Determine multidrug-resistant organisms (MDRO)}
 \usage{
-MDRO(tbl, country = NULL, col_mo = "mo", info = TRUE,
+MDRO(tbl, country = NULL, col_mo = NULL, info = TRUE,
   amcl = "amcl", amik = "amik", amox = "amox", ampi = "ampi",
   azit = "azit", aztr = "aztr", cefa = "cefa", cfra = "cfra",
   cfep = "cfep", cfot = "cfot", cfox = "cfox", cfta = "cfta",
@@ -22,8 +22,7 @@ MDRO(tbl, country = NULL, col_mo = "mo", info = TRUE,
   peni = "peni", pita = "pita", poly = "poly", qida = "qida",
   rifa = "rifa", roxi = "roxi", siso = "siso", teic = "teic",
   tetr = "tetr", tica = "tica", tige = "tige", tobr = "tobr",
-  trim = "trim", trsu = "trsu", vanc = "vanc",
-  col_bactid = "bactid")
+  trim = "trim", trsu = "trsu", vanc = "vanc", col_bactid = NULL)
 
 BRMO(tbl, country = "nl", ...)
 
diff --git a/man/resistance_predict.Rd b/man/resistance_predict.Rd
index 4d47b6d5..7f9e872e 100644
--- a/man/resistance_predict.Rd
+++ b/man/resistance_predict.Rd
@@ -73,13 +73,7 @@ septic_patients \%>\%
   # get bacteria properties like genus and species
   left_join_microorganisms("mo") \%>\%
   # calculate first isolates
-  mutate(first_isolate =
-           first_isolate(.,
-                         "date",
-                         "patient_id",
-                         "mo",
-                         col_specimen = NA,
-                         col_icu = NA)) \%>\%
+  mutate(first_isolate = first_isolate(.)) \%>\%
   # filter on first E. coli isolates
   filter(genus == "Escherichia",
          species == "coli",