diff --git a/Makefile b/Makefile
index 06c52cf9f..8334bc65e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,12 @@
 
 test:
 	set -e
-	snakemake run_all_scenarios -c1 -F --configfile test/config.custom.yaml
-	snakemake solve_all_networks -call -F --configfile test/config.tutorial_noprogress.yaml
-	snakemake solve_all_networks_monte -call -F --configfile test/config.monte_carlo.yaml
-	snakemake solve_all_networks -call -F --configfile test/config.landlock.yaml
+	snakemake solve_all_networks -call --configfile config.tutorial.yaml
+	snakemake solve_all_networks -call --configfile config.tutorial.yaml test/config.custom.yaml
+	snakemake solve_all_networks -call --configfile config.tutorial.yaml configs/scenarios/config.NG.yaml
+	snakemake solve_all_networks -call --configfile config.tutorial.yaml test/config.tutorial_noprogress.yaml
+	snakemake solve_all_networks_monte -call --configfile config.tutorial.yaml test/config.monte_carlo.yaml
+	snakemake solve_all_networks -call --configfile config.tutorial.yaml test/config.landlock.yaml
 	echo "All tests completed successfully."
 
 setup:
diff --git a/Snakefile b/Snakefile
index aea39d408..d55b06fed 100644
--- a/Snakefile
+++ b/Snakefile
@@ -18,12 +18,12 @@ from pathlib import Path
 
 HTTP = HTTPRemoteProvider()
 
-if not exists("config.yaml"):
-    copyfile("config.tutorial.yaml", "config.yaml")
-
 
+configfile: "config.default.yaml"
 configfile: "config.yaml"
-configfile: "configs/bundle_config.yaml"
+
+
+# configfile: "configs/bundle_config.yaml"
 
 
 config.update({"git_commit": get_last_commit_message(".")})
diff --git a/configs/scenarios/config.NG.yaml b/configs/scenarios/config.NG.yaml
index 76e237b12..956d90189 100644
--- a/configs/scenarios/config.NG.yaml
+++ b/configs/scenarios/config.NG.yaml
@@ -17,6 +17,3 @@ countries:
 
 scenario:
   clusters: [5]
-
-enable:
-  retrieve_databundle: false