diff --git a/scripts/aggregator/ellipse.py b/scripts/aggregator/ellipse.py
index 51e8779..d8c4050 100644
--- a/scripts/aggregator/ellipse.py
+++ b/scripts/aggregator/ellipse.py
@@ -30,14 +30,14 @@ def clean(database_file):
     database_sqlite = path.join(conf.instance.output_path, f"{database_file}.sqlite")
     if path.exists(database_sqlite):
         os.remove(database_sqlite)
-    result_path = path.join(conf.instance.output_path, database_file)
+    result_path = path.join(conf.instance.output_path, "test_mode", database_file)
     if path.exists(result_path):
         shutil.rmtree(result_path)
 
 
 @with_config("general", "output", "samples_to_csv", value=True)
 def aggregator_from(database_file, analysis, model, samples):
-    result_path = path.join(conf.instance.output_path, database_file)
+    result_path = path.join(conf.instance.output_path, "test_mode", database_file)
     clean(database_file)
     search = ag.m.MockSearch(
         samples=samples, result=ag.m.MockResult(model=model, samples=samples)
diff --git a/scripts/aggregator/fit_imaging.py b/scripts/aggregator/fit_imaging.py
index e4578f3..fd69770 100644
--- a/scripts/aggregator/fit_imaging.py
+++ b/scripts/aggregator/fit_imaging.py
@@ -39,14 +39,14 @@ def clean():
     database_sqlite = path.join(conf.instance.output_path, f"{database_file}.sqlite")
     if path.exists(database_sqlite):
         os.remove(database_sqlite)
-    result_path = path.join(conf.instance.output_path, database_file)
+    result_path = path.join(conf.instance.output_path, "test_mode", database_file)
     if path.exists(result_path):
         shutil.rmtree(result_path)
 
 
 @with_config("general", "output", "samples_to_csv", value=True)
 def aggregator_from(analysis, model, samples):
-    result_path = path.join(conf.instance.output_path, database_file)
+    result_path = path.join(conf.instance.output_path, "test_mode", database_file)
     clean()
     search = ag.m.MockSearch(
         samples=samples, result=ag.m.MockResult(model=model, samples=samples)
@@ -200,7 +200,7 @@ def make_samples(model):
 database_sqlite = path.join(conf.instance.output_path, f"{db_file_imaging}.sqlite")
 if path.exists(database_sqlite):
     os.remove(database_sqlite)
-result_path = path.join(conf.instance.output_path, db_file_imaging)
+result_path = path.join(conf.instance.output_path, "test_mode", db_file_imaging)
 if path.exists(result_path):
     shutil.rmtree(result_path)
 
@@ -215,7 +215,7 @@ def _agg_imaging():
     analysis_oversampled.visualize_before_fit(paths=search.paths, model=model)
     db = path.join(conf.instance.output_path, f"{db_file_imaging}.sqlite")
     agg = af.Aggregator.from_database(filename=db)
-    agg.add_directory(directory=path.join(conf.instance.output_path, db_file_imaging))
+    agg.add_directory(directory=path.join(conf.instance.output_path, "test_mode", db_file_imaging))
     return agg
 
 
@@ -231,7 +231,7 @@ def _agg_imaging():
 database_sqlite = path.join(conf.instance.output_path, f"{db_file_imaging}.sqlite")
 if path.exists(database_sqlite):
     os.remove(database_sqlite)
-result_path = path.join(conf.instance.output_path, db_file_imaging)
+result_path = path.join(conf.instance.output_path, "test_mode", db_file_imaging)
 if path.exists(result_path):
     shutil.rmtree(result_path)
 
diff --git a/scripts/aggregator/fit_interferometer.py b/scripts/aggregator/fit_interferometer.py
index 7aa1962..f3e4366 100644
--- a/scripts/aggregator/fit_interferometer.py
+++ b/scripts/aggregator/fit_interferometer.py
@@ -39,14 +39,14 @@ def clean():
     database_sqlite = path.join(conf.instance.output_path, f"{database_file}.sqlite")
     if path.exists(database_sqlite):
         os.remove(database_sqlite)
-    result_path = path.join(conf.instance.output_path, database_file)
+    result_path = path.join(conf.instance.output_path, "test_mode", database_file)
     if path.exists(result_path):
         shutil.rmtree(result_path)
 
 
 @with_config("general", "output", "samples_to_csv", value=True)
 def aggregator_from(analysis, model, samples):
-    result_path = path.join(conf.instance.output_path, database_file)
+    result_path = path.join(conf.instance.output_path, "test_mode", database_file)
     clean()
     search = ag.m.MockSearch(
         samples=samples, result=ag.m.MockResult(model=model, samples=samples)
@@ -193,7 +193,7 @@ def make_samples(model):
 database_sqlite = path.join(conf.instance.output_path, f"{db_file_inter}.sqlite")
 if path.exists(database_sqlite):
     os.remove(database_sqlite)
-result_path = path.join(conf.instance.output_path, db_file_inter)
+result_path = path.join(conf.instance.output_path, "test_mode", db_file_inter)
 if path.exists(result_path):
     shutil.rmtree(result_path)
 
@@ -208,7 +208,7 @@ def _agg_inter():
     analysis_custom.visualize_before_fit(paths=search.paths, model=model)
     db = path.join(conf.instance.output_path, f"{db_file_inter}.sqlite")
     agg = af.Aggregator.from_database(filename=db)
-    agg.add_directory(directory=path.join(conf.instance.output_path, db_file_inter))
+    agg.add_directory(directory=path.join(conf.instance.output_path, "test_mode", db_file_inter))
     return agg
 
 
@@ -224,7 +224,7 @@ def _agg_inter():
 database_sqlite = path.join(conf.instance.output_path, f"{db_file_inter}.sqlite")
 if path.exists(database_sqlite):
     os.remove(database_sqlite)
-result_path = path.join(conf.instance.output_path, db_file_inter)
+result_path = path.join(conf.instance.output_path, "test_mode", db_file_inter)
 if path.exists(result_path):
     shutil.rmtree(result_path)
 
diff --git a/scripts/aggregator/galaxies.py b/scripts/aggregator/galaxies.py
index 6f119bc..e46f4f4 100644
--- a/scripts/aggregator/galaxies.py
+++ b/scripts/aggregator/galaxies.py
@@ -32,14 +32,14 @@ def clean():
     database_sqlite = path.join(conf.instance.output_path, f"{database_file}.sqlite")
     if path.exists(database_sqlite):
         os.remove(database_sqlite)
-    result_path = path.join(conf.instance.output_path, database_file)
+    result_path = path.join(conf.instance.output_path, "test_mode", database_file)
     if path.exists(result_path):
         shutil.rmtree(result_path)
 
 
 @with_config("general", "output", "samples_to_csv", value=True)
 def aggregator_from(analysis, model, samples):
-    result_path = path.join(conf.instance.output_path, database_file)
+    result_path = path.join(conf.instance.output_path, "test_mode", database_file)
     clean()
     search = ag.m.MockSearch(
         samples=samples, result=ag.m.MockResult(model=model, samples=samples)