diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 01b179b5..b737c119 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -103,5 +103,5 @@ jobs:
         conda activate pypsa-eur
         conda list
         snakemake -call solve_all_elec_networks --configfile test/config.test1.yaml
-        snakemake -call --configfile test/config.overnight.yaml
-        snakemake -call --configfile test/config.myopic.yaml
+        snakemake -call all --configfile test/config.overnight.yaml
+        snakemake -call all --configfile test/config.myopic.yaml
diff --git a/Snakefile b/Snakefile
index 563e61b3..90b3ce5d 100644
--- a/Snakefile
+++ b/Snakefile
@@ -282,7 +282,7 @@ if config["enable"].get("retrieve_cost_data", True):
                 keep_local=True,
             ),
         output:
-            "data/costs_{year}.csv",
+            "data/" + RDIR + "costs_{year}.csv",
         log:
             "logs/" + RDIR + "retrieve_cost_data_{year}.log",
         resources:
diff --git a/test/config.myopic.yaml b/test/config.myopic.yaml
index 34ad488b..5f3eb513 100644
--- a/test/config.myopic.yaml
+++ b/test/config.myopic.yaml
@@ -1,9 +1,15 @@
-run: test-myopic
+# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+#
+# SPDX-License-Identifier: CC0-1.0
+
+run:
+  name: "test-sector-myopic" 
+
 foresight: myopic
 
 scenario:
-  lv:
-  - 1.5
+  ll:
+  - v1.5
   clusters:
   - 5
   sector_opts:
@@ -13,12 +19,32 @@ scenario:
   - 2040
   - 2050
 
+countries: ['BE']
+
 snapshots:
   start: "2013-03-01"
   end: "2013-04-01"
 
 atlite:
-  cutout: ../pypsa-eur/cutouts/be-03-2013-era5.nc
+  default_cutout: be-03-2013-era5
+  cutouts:
+    be-03-2013-era5:
+      module: era5
+      x: [4., 15.]
+      y: [46., 56.]
+      time: ["2013-03-01", "2013-03-08"]
+
+renewable:
+  onwind:
+    cutout: be-03-2013-era5
+  offwind-ac:
+    cutout: be-03-2013-era5
+    max_depth: false
+  offwind-dc:
+    cutout: be-03-2013-era5
+    max_depth: false
+  solar:
+    cutout: be-03-2013-era5
 
 solving:
   solver:
diff --git a/test/config.overnight.yaml b/test/config.overnight.yaml
index e8f8194a..7adb2eb9 100644
--- a/test/config.overnight.yaml
+++ b/test/config.overnight.yaml
@@ -1,9 +1,13 @@
-run: test-overnight
-foresight: overnight
+# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+#
+# SPDX-License-Identifier: CC0-1.0
+
+run:
+  name: "test-sector-overnight" 
 
 scenario:
-  lv:
-  - 1.5
+  ll:
+  - v1.5
   clusters:
   - 5
   sector_opts:
@@ -11,12 +15,35 @@ scenario:
   planning_horizons:
   - 2030
 
+countries: ['BE']
+
 snapshots:
   start: "2013-03-01"
   end: "2013-04-01"
 
+electricity:
+  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc]
+
 atlite:
-  cutout: ../pypsa-eur/cutouts/be-03-2013-era5.nc
+  default_cutout: be-03-2013-era5
+  cutouts:
+    be-03-2013-era5:
+      module: era5
+      x: [4., 15.]
+      y: [46., 56.]
+      time: ["2013-03-01", "2013-03-08"]
+
+renewable:
+  onwind:
+    cutout: be-03-2013-era5
+  offwind-ac:
+    cutout: be-03-2013-era5
+    max_depth: false
+  offwind-dc:
+    cutout: be-03-2013-era5
+    max_depth: false
+  solar:
+    cutout: be-03-2013-era5
 
 sector:
   gas_network: true
diff --git a/test/config.test1.yaml b/test/config.test1.yaml
index cf8e06bc..0475cc05 100755
--- a/test/config.test1.yaml
+++ b/test/config.test1.yaml
@@ -4,9 +4,14 @@
 
 tutorial: true
 
+run:
+  name: "test-elec" # use this to keep track of runs with different settings
+
 scenario:
-  clusters: [5]
-  opts: [Co2L-24H]
+  clusters: 
+  - 5
+  opts: 
+  - Co2L-24H
 
 countries: ['BE']
 
@@ -27,6 +32,7 @@ electricity:
 
 
 atlite:
+  default_cutout: be-03-2013-era5
   cutouts:
     be-03-2013-era5:
       module: era5