diff --git a/.gitignore b/.gitignore
index 05d014b..463b416 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@
 */data
 */generated
 
-test__*
\ No newline at end of file
+test__*
+_.test.*
diff --git a/_scripts/test_comp.sh b/_scripts/test_comp.sh
index 49722eb..fa08fb0 100755
--- a/_scripts/test_comp.sh
+++ b/_scripts/test_comp.sh
@@ -237,14 +237,14 @@ SETUP "stopping $TARGET_COMP_1_DISPLAY & $TARGET_COMP_2_DISPLAY without options"
 CHECK $'grep -Pqs "Container $TARGET_COMP_1.* Removed" "$COMP_ERR_PATH"' \
       "Stopped $TARGET_COMP_1_DISPLAY successfully" \
       exit_on_failure
-CHECK $'grep -qs "No resource found to remove for project \\\\\\\\\\"$TARGET_COMP_2\\\\\\\\\\"" "$COMP_ERR_PATH"' \
+CHECK $'grep -Pqs "No resource found to remove for project .*$TARGET_COMP_2" "$COMP_ERR_PATH"' \
       "Nothing to remove reported for $TARGET_COMP_2_DISPLAY" \
       exit_on_failure
 CHECK $'[ $COMP_EXIT_CODE -eq 0 ]' \
       "EXIT_CODE = 0" \
       exit_on_failure
 
-_INIT tang _ .bad.name_
+_INIT tang _.test.very_ .bad.name_
 
 SETUP "starting $TARGET_COMP_3_DISPLAY" \
       "up -P $TARGET_COMP_3"
@@ -256,6 +256,8 @@ CHECK $'[ $COMP_EXIT_CODE -eq 0 ]' \
       "EXIT_CODE = 0" \
       exit_on_failure
 
+_WAIT 30s "$TARGET_COMP_3_DISPLAY to start up and emit health status"
+
 SETUP "that status reports $TARGET_COMP_3_DISPLAY is healthy" \
       "status -P $TARGET_COMP_3"
 CHECK $'grep -qs "drops all \'\.\' from project name" "$COMP_ERR_PATH"' \
@@ -265,7 +267,7 @@ CHECK $'grep -qs "drops leading \'_\' from project name" "$COMP_ERR_PATH"' \
 CHECK $'grep -qs "Guessing project name to be" "$COMP_ERR_PATH"' \
       "Best-effort guess for project name"
 CHECK $'[ $COMP_EXIT_CODE -eq 0 ]' \
-      "EXIT_CODE = 0; best-effort guess works (for now)" \
+      "EXIT_CODE = 0; best-effort guess works for now" \
       exit_on_failure
 
 SETUP "stopping & cleaning $TARGET_COMP_3_DISPLAY" \
@@ -277,7 +279,7 @@ CHECK $'grep -qs "drops leading \'_\' from project name" "$COMP_ERR_PATH"' \
 CHECK $'grep -qs "Guessing project name to be" "$COMP_ERR_PATH"' \
       "Best-effort guess for project name"
 CHECK $'[ $COMP_EXIT_CODE -eq 0 ]' \
-      "EXIT_CODE = 0; best-effort guess works (for now)" \
+      "EXIT_CODE = 0; best-effort guess works for now" \
       exit_on_failure
 
 FINAL
diff --git a/_test__3__tang__.bad.name_/docker-compose.labels.yml b/_test__3__tang__.bad.name_/docker-compose.labels.yml
deleted file mode 100644
index b91d218..0000000
--- a/_test__3__tang__.bad.name_/docker-compose.labels.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-services:
-  tang:
-    labels:
-      traefik.enable: true
-      traefik.http.middlewares.strip-tang-prefix.stripPrefix.prefixes: "/tang"
-      traefik.http.routers.tang.rule: PathPrefix(`/tang`)
-      traefik.http.routers.tang.entryPoints: lan-http
-      traefik.http.routers.tang.middlewares: strip-tang-prefix
diff --git a/_test__3__tang__.bad.name_/docker-compose.logging.yml b/_test__3__tang__.bad.name_/docker-compose.logging.yml
deleted file mode 100644
index 13dd985..0000000
--- a/_test__3__tang__.bad.name_/docker-compose.logging.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  tang:
-    logging:
-      options:
-        max-size: "1m"
-        max-file: "1"
diff --git a/_test__3__tang__.bad.name_/docker-compose.pre_hook.sh b/_test__3__tang__.bad.name_/docker-compose.pre_hook.sh
deleted file mode 100755
index 98b9898..0000000
--- a/_test__3__tang__.bad.name_/docker-compose.pre_hook.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -Eumo pipefail
-
-SELF_DIR="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
-DATA_DIR="$SELF_DIR/data"
-
-mkdir -p "$DATA_DIR/tang/db"
diff --git a/_test__3__tang__.bad.name_/docker-compose.yml b/_test__3__tang__.bad.name_/docker-compose.yml
deleted file mode 100644
index fcc178f..0000000
--- a/_test__3__tang__.bad.name_/docker-compose.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-networks:
-  proxy:
-    external: true
-
-services:
-  tang:
-    hostname: tang
-    image: padhihomelab/tang:git.02105756_git.339ad6c8
-    restart: unless-stopped
-
-    security_opt:
-    # NOTE: Do NOT add a [space] before `true` below.
-    - no-new-privileges:true
-
-    networks:
-    - proxy
-    volumes:
-    - ./data/tang/db:/db:rw
-
-    environment:
-      DOCKER_UID: ${USER_ID:?}
diff --git a/_test__3__tang__.bad.name_/pre.reqs b/_test__3__tang__.bad.name_/pre.reqs
deleted file mode 100644
index 73a0ec3..0000000
--- a/_test__3__tang__.bad.name_/pre.reqs
+++ /dev/null
@@ -1 +0,0 @@
-traefik