diff --git a/src/auto_archiver/modules/gsheet_feeder/gsheet_feeder.py b/src/auto_archiver/modules/gsheet_feeder/gsheet_feeder.py
index 7cf4263..ea724e7 100644
--- a/src/auto_archiver/modules/gsheet_feeder/gsheet_feeder.py
+++ b/src/auto_archiver/modules/gsheet_feeder/gsheet_feeder.py
@@ -24,7 +24,7 @@ class GsheetsFeeder(Feeder):
     def setup(self) -> None:
         self.gsheets_client = gspread.service_account(filename=self.service_account)
         # TODO mv to validators
-        if not (self.sheet or self.sheet_id):
+        if not self.sheet and not self.sheet_id:
             raise ValueError("You need to define either a 'sheet' name or a 'sheet_id' in your manifest.")
 
     def open_sheet(self):
diff --git a/tests/enrichers/test_wacz_enricher.py b/tests/enrichers/test_wacz_enricher.py
index d55733d..ceab83b 100644
--- a/tests/enrichers/test_wacz_enricher.py
+++ b/tests/enrichers/test_wacz_enricher.py
@@ -18,7 +18,7 @@ def wacz_enricher(setup_module, mock_binary_dependencies):
         "socks_proxy_port": None,
         "proxy_server": None,
     }
-    wacz = setup_module("wacz_enricher", configs)
+    wacz = setup_module("wacz_extractor_enricher", configs)
     return wacz
 
 
diff --git a/tests/feeders/test_gsheet_feeder.py b/tests/feeders/test_gsheet_feeder.py
index 7c5f501..ef150d1 100644
--- a/tests/feeders/test_gsheet_feeder.py
+++ b/tests/feeders/test_gsheet_feeder.py
@@ -9,7 +9,7 @@ from auto_archiver.core import Metadata, Feeder
 def test_setup_without_sheet_and_sheet_id(setup_module, mocker):
     # Ensure setup() raises AssertionError if neither sheet nor sheet_id is set.
     mocker.patch("gspread.service_account")
-    with pytest.raises(AssertionError):
+    with pytest.raises(ValueError):
         setup_module(
             "gsheet_feeder",
             {"service_account": "dummy.json", "sheet": None, "sheet_id": None},
diff --git a/tests/test_orchestrator.py b/tests/test_orchestrator.py
index ee1b9af..752adb8 100644
--- a/tests/test_orchestrator.py
+++ b/tests/test_orchestrator.py
@@ -165,10 +165,10 @@ def test_load_settings_for_module_from_commandline(orchestrator, test_args):
 
 def test_multiple_orchestrator(test_args):
 
-    o1_args = test_args + ["--feeders", "gsheet_feeder"]
+    o1_args = test_args + ["--feeders", "gsheet_feeder", "--gsheet_feeder.service_account", "tests/data/test_service_account.json"]
     o1 = ArchivingOrchestrator()
 
-    with pytest.raises(AssertionError) as exit_error:
+    with pytest.raises(ValueError) as exit_error:
         # this should fail because the gsheet_feeder requires a sheet_id / sheet
         o1.setup(o1_args)