diff --git a/simvue/client.py b/simvue/client.py
index a5633212..7e7a4cdd 100644
--- a/simvue/client.py
+++ b/simvue/client.py
@@ -279,8 +279,8 @@ def get_runs(
         _runs = Run.get(
             count=count_limit,
             offset=start_index,
-            attributes=json.dumps(attributes),
-            filters=json.dumps(filters),
+            attributes=json.dumps(attributes) if attributes is not None else None,
+            filters=json.dumps(filters) if filters is not None else None,
             return_basic=True,
             return_system=system_info,
             return_timing=timing_info,
diff --git a/tests/unit/test_s3_storage.py b/tests/unit/test_s3_storage.py
index ee957b31..6a3413d9 100644
--- a/tests/unit/test_s3_storage.py
+++ b/tests/unit/test_s3_storage.py
@@ -18,11 +18,11 @@ def test_create_s3_online() -> None:
         disable_check=True,
         is_tenant_useable=False,
         is_default=False,
-        region_name="fictionsville",
+        region_name="eu-fiction-1",
         access_key_id="dummy_key",
         secret_access_key="not_a_key",
         ca_cert="invalid_ca_cert",
-        bucket="dummy_bucket",
+        bucket="dummy-bucket",
         is_enabled=False
     )
     _storage.commit()
@@ -34,8 +34,8 @@ def test_create_s3_online() -> None:
     assert _storage.to_dict()
     assert _storage.name == _uuid
     assert _storage.config.endpoint_url == "https://not-a-real-url.io/"
-    assert _storage.config.region_name == "fictionsville"
-    assert _storage.config.bucket == "dummy_bucket"
+    assert _storage.config.region_name == "eu-fiction-1"
+    assert _storage.config.bucket == "dummy-bucket"
     assert _storage.created
     assert dict(Storage.get())
     _storage.delete()
@@ -51,10 +51,10 @@ def test_create_s3_offline(offline_cache_setup) -> None:
         name=_uuid,
         endpoint_url="https://not-a-real-url.io",
         disable_check=True,
-        region_name="fictionsville",
+        region_name="eu-fiction-1",
         access_key_id="dummy_key",
         secret_access_key="not_a_key",
-        bucket="dummy_bucket",
+        bucket="dummy-bucket",
         is_default=False,
         is_tenant_useable=False,
         is_enabled=False,
@@ -65,8 +65,8 @@ def test_create_s3_offline(offline_cache_setup) -> None:
         _local_data = json.load(in_f)
     assert _local_data.get("name") == _uuid
     assert _local_data.get("config").get("endpoint_url") == "https://not-a-real-url.io/"
-    assert _local_data.get("config").get("region_name") == "fictionsville"
-    assert _local_data.get("config").get("bucket") == "dummy_bucket"
+    assert _local_data.get("config").get("region_name") == "eu-fiction-1"
+    assert _local_data.get("config").get("bucket") == "dummy-bucket"
     assert _local_data.get("is_enabled") == False
     assert not _local_data.get("status", None)
     assert not _local_data.get("user", None)
@@ -82,8 +82,8 @@ def test_create_s3_offline(offline_cache_setup) -> None:
     assert _online_storage.name == _uuid
     assert _online_storage.is_enabled == False
     assert _online_storage.config.endpoint_url == "https://not-a-real-url.io/"
-    assert _online_storage.config.region_name == "fictionsville"
-    assert _online_storage.config.bucket == "dummy_bucket"
+    assert _online_storage.config.region_name == "eu-fiction-1"
+    assert _online_storage.config.bucket == "dummy-bucket"
     
     _online_storage.read_only(False)
     _online_storage.delete()