diff --git a/files/cf-exclude-include.json b/files/cf-exclude-include.json
index 70b85654..bce11c40 100644
--- a/files/cf-exclude-include.json
+++ b/files/cf-exclude-include.json
@@ -4,10 +4,10 @@
     "auudio-forge",
     "appleskin",
     "armor-toughness-bar",
-    "beehive-tooltips",
+    "beehivetooltips",
     "better-advancements",
     "betterf3",
-    "bettertags",
+    "better-tips-nbt-tag",
     "better-third-person",
     "biomeinfo",
     "block-drops-jei-addon",
@@ -21,12 +21,12 @@
     "ding",
     "drippy-loading-screen",
     "dynamiclights-reforged",
-    "effective_fg",
+    "effective-forge",
     "embeddium",
     "embeddium-extension",
     "embeddium-extras",
     "enchantment-descriptions",
-    "entity_collision_fps_fix",
+    "entity-collision-fps-fix",
     "entity-texture-features-fabric",
     "entityculling",
     "extreme-sound-muffler",
@@ -35,12 +35,12 @@
     "falling-leaves-forge",
     "fancymenu",
     "free-cam",
-    "ftbbackups2",
+    "ftb-backups-2",
     "ignitioncoil",
     "inmisaddon",
     "irisshaders",
     "iris-flywheel-compat",
-    "Item-Obliterator",
+    "item-obliterator",
     "itemzoom",
     "just-enough-harvestcraft",
     "just-enough-resources-jer",
@@ -69,7 +69,7 @@
     "searchables",
     "skin-layers-3d",
     "sodium",
-    "soundphysics",
+    "sound-physics-remastered",
     "textrues-embeddium-options",
     "textrues-rubidium-options",
     "thaumic-jei",
diff --git a/tests/setuponlytests/test.sh b/tests/setuponlytests/test.sh
index fb0b4399..f4c467ab 100755
--- a/tests/setuponlytests/test.sh
+++ b/tests/setuponlytests/test.sh
@@ -2,6 +2,8 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+: "${IMAGE_TO_TEST:=itzg/minecraft-server}"
+
 # go to script root directory
 cd "$(dirname "$0")" || exit 1
 
@@ -46,7 +48,7 @@ setupOnlyMinecraftTest(){
     outputContainerLog "$logs"
     result=1
   elif [ -f verify.sh ]; then
-    if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" -e /verify; then
+    if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST}" -e /verify; then
       endTime=$(date +%s)
       echo "${folder} FAILED verify in $(delta start)"
       outputContainerLog "$logs"
@@ -74,7 +76,7 @@ if (( $# > 0 )); then
 else
   readarray -t folders < <(find . -maxdepth 2 -mindepth 2 -name docker-compose.yml -printf '%h\n')
   for folder in "${folders[@]}"; do
-    echo "Starting Tests in ${folder}"
+    echo "Starting Tests in ${folder} using $IMAGE_TO_TEST"
     setupOnlyMinecraftTest "$folder"
   done
 fi