diff --git a/Makefile b/Makefile
index aeee8dbbe..8a30163d5 100644
--- a/Makefile
+++ b/Makefile
@@ -57,9 +57,11 @@ help:
 .PHONY: clean
 # HELP: remove all compilation results in the directory but leave containers and images unharmed
 clean:
+	$(MAKE) stop
 	-rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known
 	-rm -rf .stack-work .stack-work-build .stack-work-run .stack-work-test .stack-work-doc
 	-rm -rf bin .Dockerfile develop
+	-$(CONTAINER_COMMAND) container prune --force
 .PHONY: clean-all
 # HELP: like clean but with container and image prune
 clean-all: clean
@@ -112,7 +114,7 @@ lint: lint-frontend lint-backend;
 
 .PHONY: test
 # HELP: test frontend, backend, and check internationalization
-test: test-frontend test-backend i18n-check;
+test: start-database test-frontend test-backend i18n-check;
 
 ##### UNIFIED FRONTEND/BACKEND TARGETS #####
 ############################################
@@ -260,7 +262,7 @@ db: --image-build --containerized---db;
 --containerized---start-memcached:
 	MEMCACHED_PORT=`cat $(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`; \
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
-	CONTAINER_ID=`$(CONTAINER_BGRUN) $(MEMCACHED_IMAGE) --port=$${MEMCACHED_PORT}` ; \
+	CONTAINER_ID=`$(CONTAINER_BGRUN) --name fradrive.memcached.$$(date +'%Y-%m-%dT%H-%M-%S') $(MEMCACHED_IMAGE) --port=$${MEMCACHED_PORT}` ; \
 	printf "CONTAINER_ID=$${CONTAINER_ID}\nMEMCACHED_PORT=$${MEMCACHED_PORT}" >> $(CONTAINER_FILE)
 
 --containerized-%-database: FRADRIVE_SERVICE=database
@@ -352,7 +354,8 @@ stop:
 	rm -rf develop
 .PHONY: stop-%
 # HELP(stop-{database,memcached,minio,backend,frontend,hoogle}): stop all currently running develop instances of a given type
-stop-%: --stop-%
+stop-%:
+	$(SET_DEVELOP)
 	rm -rf $(DEVELOP)/$*
 stop-container-by-file:
 	rm $(CONTAINER_FILE)