diff --git a/Cargo.lock b/Cargo.lock
index b30d818..afad385 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -88,19 +88,20 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
+ "once_cell",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.94"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
+checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
 
 [[package]]
 name = "arc-swap"
@@ -136,13 +137,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.83"
+version = "0.1.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -189,15 +190,15 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
 [[package]]
 name = "bstr"
-version = "1.11.1"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "786a307d683a5bf92e6fd5fd69a7eb613751668d1d8d67d802846dfe367c62c8"
+checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
 dependencies = [
  "memchr",
  "regex-automata",
@@ -206,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "byteorder"
@@ -218,9 +219,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 
 [[package]]
 name = "cargo-husky"
@@ -245,9 +246,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.5"
+version = "1.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
+checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af"
 dependencies = [
  "shlex",
 ]
@@ -281,9 +282,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.23"
+version = "4.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
+checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -291,9 +292,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.23"
+version = "4.5.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
+checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
 dependencies = [
  "anstream",
  "anstyle",
@@ -303,23 +304,23 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.40"
+version = "4.5.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9"
+checksum = "1e3040c8291884ddf39445dc033c70abc2bc44a42f0a3a00571a0f483a83f0cd"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -346,9 +347,9 @@ dependencies = [
 
 [[package]]
 name = "compact_str"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644"
+checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32"
 dependencies = [
  "castaway",
  "cfg-if",
@@ -455,7 +456,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -466,7 +467,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -498,7 +499,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -575,7 +576,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -613,9 +614,9 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
@@ -731,7 +732,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -778,7 +779,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -789,15 +802,15 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "h2"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -865,9 +878,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.5"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
 
 [[package]]
 name = "httpdate"
@@ -899,9 +912,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.5.2"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1108,7 +1121,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -1140,9 +1153,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1150,9 +1163,9 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.9"
+version = "0.17.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
+checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
 dependencies = [
  "console",
  "number_prefix",
@@ -1169,23 +1182,22 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "instability"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "898e106451f7335950c9cc64f8ec67b5f65698679ac67ed00619aeef14e1cf75"
+checksum = "0bf9fed6d91cfb734e7476a06bde8300a1b94e217e1b523b6f0cd1a01998c71d"
 dependencies = [
  "darling",
  "indoc",
- "pretty_assertions",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.10.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1210,9 +1222,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -1242,9 +1254,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "litemap"
@@ -1264,9 +1276,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 dependencies = [
  "serde",
 ]
@@ -1354,6 +1366,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
+ "serial_test",
  "strum",
  "strum_macros",
  "tokio",
@@ -1386,9 +1399,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
+checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
 dependencies = [
  "adler2",
 ]
@@ -1401,7 +1414,7 @@ checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "log",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1428,7 +1441,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -1457,9 +1470,9 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
 dependencies = [
  "libc",
  "log",
@@ -1525,15 +1538,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "openssl"
-version = "0.10.70"
+version = "0.10.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6"
+checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1552,29 +1565,29 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-src"
-version = "300.4.1+3.4.0"
+version = "300.4.2+3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c"
+checksum = "168ce4e058f975fe43e89d9ccf78ca668601887ae736090aacc23ae353c298e2"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.105"
+version = "0.9.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc"
+checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
 dependencies = [
  "cc",
  "libc",
@@ -1600,9 +1613,9 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.9.0"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ca711d8b83edbb00b44d504503cd247c9c0bd8b0fa2694f2a1a3d8165379ce"
+checksum = "2a604e53c24761286860eba4e2c8b23a0161526476b1de520139d69cdb85a6b5"
 dependencies = [
  "log",
  "serde",
@@ -1646,9 +1659,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1731,18 +1744,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1774,7 +1787,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -1801,9 +1814,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
 dependencies = [
  "bitflags",
 ]
@@ -1814,7 +1827,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
  "libredox",
  "thiserror",
 ]
@@ -1856,9 +1869,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "reqwest"
-version = "0.12.9"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64",
  "bytes",
@@ -1889,6 +1902,7 @@ dependencies = [
  "system-configuration",
  "tokio",
  "tokio-native-tls",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -1899,15 +1913,14 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "d34b5020fcdea098ef7d95e9f89ec15952123a4a039badd09fabebe9e963e839"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
- "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
@@ -1938,7 +1951,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.90",
+ "syn 2.0.98",
  "unicode-ident",
 ]
 
@@ -1959,9 +1972,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
  "bitflags",
  "errno",
@@ -1972,9 +1985,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.20"
+version = "0.23.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
+checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
@@ -1994,9 +2007,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
 [[package]]
 name = "rustls-webpki"
@@ -2011,15 +2024,24 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+
+[[package]]
+name = "scc"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea091f6cac2595aa38993f04f4ee692ed43757035c36e67c180b6828356385b1"
+dependencies = [
+ "sdd",
+]
 
 [[package]]
 name = "schannel"
@@ -2036,6 +2058,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "sdd"
+version = "3.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b07779b9b918cc05650cb30f404d4d7835d26df37c235eded8a6832e2fb82cca"
+
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -2051,9 +2079,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2061,15 +2089,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.24"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
 dependencies = [
  "serde_derive",
 ]
@@ -2086,20 +2114,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.134"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
 dependencies = [
  "itoa",
  "memchr",
@@ -2141,6 +2169,31 @@ dependencies = [
  "unsafe-libyaml",
 ]
 
+[[package]]
+name = "serial_test"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"
+dependencies = [
+ "futures",
+ "log",
+ "once_cell",
+ "parking_lot",
+ "scc",
+ "serial_test_derive",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -2179,9 +2232,9 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
+checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
 
 [[package]]
 name = "slab"
@@ -2194,9 +2247,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 
 [[package]]
 name = "socket2"
@@ -2208,12 +2261,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -2251,7 +2298,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2273,9 +2320,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.90"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2299,7 +2346,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2325,12 +2372,13 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "getrandom 0.3.1",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
@@ -2359,7 +2407,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2405,9 +2453,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2423,13 +2471,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -2467,9 +2515,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2488,9 +2536,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.22"
+version = "0.22.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
 dependencies = [
  "indexmap",
  "serde",
@@ -2499,6 +2547,27 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@@ -2541,9 +2610,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
 
 [[package]]
 name = "unicode-segmentation"
@@ -2632,11 +2701,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.11.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2663,14 +2732,14 @@ checksum = "5b2d5567b6fbd34e8f0488d56b648e67c0d999535f4af2060d14f9074b43e833"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "wait-timeout"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
 dependencies = [
  "libc",
 ]
@@ -2691,35 +2760,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.99"
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.49"
+version = "0.4.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2730,9 +2809,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2740,28 +2819,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "web-sys"
-version = "0.3.76"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2988,13 +3070,22 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "write16"
 version = "1.0.0"
@@ -3033,7 +3124,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
  "synstructure",
 ]
 
@@ -3055,7 +3146,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -3075,7 +3166,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
  "synstructure",
 ]
 
@@ -3104,5 +3195,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 2.0.98",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 179733c..66700b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -62,6 +62,7 @@ mockall = "0.13.0"
 mockito = "1.0.0"
 pretty_assertions = "1.3.0"
 rstest = "0.23.0"
+serial_test = "3.2.0"
 
 [dev-dependencies.cargo-husky]
 version = "1"
diff --git a/Dockerfile b/Dockerfile
index b19b0d9..eba1c08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.82 AS builder
+FROM rust:1.85 AS builder
 WORKDIR /usr/src
 
 # Download and compile Rust dependencies in an empty project and cache as a separate Docker layer
diff --git a/src/app/app_tests.rs b/src/app/app_tests.rs
index 2cdaf05..34a60c8 100644
--- a/src/app/app_tests.rs
+++ b/src/app/app_tests.rs
@@ -1,16 +1,13 @@
 #[cfg(test)]
 mod tests {
-  use crate::models::Route;
   use anyhow::anyhow;
   use pretty_assertions::{assert_eq, assert_str_eq};
-  use rstest::rstest;
-  use serde::de::value::StringDeserializer;
-  use serde::de::IntoDeserializer;
+  use serial_test::serial;
   use tokio::sync::mpsc;
 
   use crate::app::context_clues::{build_context_clue_string, SERVARR_CONTEXT_CLUES};
   use crate::app::{
-    deserialize_env_var, interpolate_env_vars, App, AppConfig, Data, ServarrConfig,
+    interpolate_env_vars, App, AppConfig, Data, ServarrConfig,
   };
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, RadarrData};
   use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, SonarrData};
@@ -19,37 +16,68 @@ mod tests {
   use crate::network::NetworkEvent;
   use tokio_util::sync::CancellationToken;
 
-  #[rstest]
-  fn test_app_new(
-    #[values(ActiveRadarrBlock::default(), ActiveSonarrBlock::default())] servarr: impl Into<Route>
-      + Copy,
-  ) {
-    let (title, config) = match servarr.into() {
-      Route::Radarr(_, _) => (
-        "Radarr",
-        AppConfig {
-          radarr: Some(ServarrConfig::default()),
-          ..AppConfig::default()
-        },
-      ),
-      Route::Sonarr(_, _) => (
-        "Sonarr",
-        AppConfig {
-          sonarr: Some(ServarrConfig::default()),
-          ..AppConfig::default()
-        },
-      ),
-      _ => unreachable!(),
+  #[test]
+  fn test_app_new() {
+    let radarr_config_1 = ServarrConfig {
+      name: Some("Radarr Test".to_owned()),
+      ..ServarrConfig::default()
     };
-    let tab_route = |title: &'static str| TabRoute {
-      title,
-      route: servarr.into(),
-      help: format!(
-        "<↑↓> scroll | ←→ change tab | {}  ",
-        build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-      ),
-      contextual_help: None,
+    let radarr_config_2 = ServarrConfig {
+      weight: Some(3),
+      ..ServarrConfig::default()
     };
+    let sonarr_config_1 = ServarrConfig {
+      name: Some("Sonarr Test".to_owned()),
+      weight: Some(1),
+      ..ServarrConfig::default()
+    };
+    let sonarr_config_2 = ServarrConfig::default();
+    let config = AppConfig {
+      radarr: Some(vec![radarr_config_1.clone(), radarr_config_2.clone()]),
+      sonarr: Some(vec![sonarr_config_1.clone(), sonarr_config_2.clone()]),
+    };
+    let expected_tab_routes = vec![
+      TabRoute {
+        title: "Sonarr Test".to_owned(),
+        route: ActiveSonarrBlock::default().into(),
+        help: format!(
+          "<↑↓> scroll | ←→ change tab | {}  ",
+          build_context_clue_string(&SERVARR_CONTEXT_CLUES)
+        ),
+        contextual_help: None,
+        config: Some(sonarr_config_1),
+      },
+      TabRoute {
+        title: "Radarr 1".to_owned(),
+        route: ActiveRadarrBlock::default().into(),
+        help: format!(
+          "<↑↓> scroll | ←→ change tab | {}  ",
+          build_context_clue_string(&SERVARR_CONTEXT_CLUES)
+        ),
+        contextual_help: None,
+        config: Some(radarr_config_2),
+      },
+      TabRoute {
+        title: "Radarr Test".to_owned(),
+        route: ActiveRadarrBlock::default().into(),
+        help: format!(
+          "<↑↓> scroll | ←→ change tab | {}  ",
+          build_context_clue_string(&SERVARR_CONTEXT_CLUES)
+        ),
+        contextual_help: None,
+        config: Some(radarr_config_1),
+      },
+      TabRoute {
+        title: "Sonarr 1".to_owned(),
+        route: ActiveSonarrBlock::default().into(),
+        help: format!(
+          "<↑↓> scroll | ←→ change tab | {}  ",
+          build_context_clue_string(&SERVARR_CONTEXT_CLUES)
+        ),
+        contextual_help: None,
+        config: Some(sonarr_config_2),
+      },
+    ];
 
     let app = App::new(
       mpsc::channel::<NetworkEvent>(500).0,
@@ -58,13 +86,13 @@ mod tests {
     );
 
     assert!(app.navigation_stack.is_empty());
-    assert_eq!(app.get_current_route(), servarr.into());
+    assert_eq!(app.get_current_route(), ActiveSonarrBlock::default().into());
     assert!(app.network_tx.is_some());
     assert!(!app.cancellation_token.is_cancelled());
     assert!(app.is_first_render);
     assert_eq!(app.error, HorizontallyScrollableText::default());
     assert_eq!(app.server_tabs.index, 0);
-    assert_eq!(app.server_tabs.tabs, vec![tab_route(title)]);
+    assert_eq!(app.server_tabs.tabs, expected_tab_routes);
     assert_eq!(app.tick_until_poll, 400);
     assert_eq!(app.ticks_until_scroll, 4);
     assert_eq!(app.tick_count, 0);
@@ -85,29 +113,6 @@ mod tests {
     assert!(app.is_first_render);
     assert_eq!(app.error, HorizontallyScrollableText::default());
     assert_eq!(app.server_tabs.index, 0);
-    assert_eq!(
-      app.server_tabs.tabs,
-      vec![
-        TabRoute {
-          title: "Radarr",
-          route: ActiveRadarrBlock::Movies.into(),
-          help: format!(
-            "<↑↓> scroll | ←→ change tab | {}  ",
-            build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-          ),
-          contextual_help: None,
-        },
-        TabRoute {
-          title: "Sonarr",
-          route: ActiveSonarrBlock::Series.into(),
-          help: format!(
-            "<↑↓> scroll | ←→ change tab | {}  ",
-            build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-          ),
-          contextual_help: None,
-        },
-      ]
-    );
     assert_eq!(app.tick_until_poll, 400);
     assert_eq!(app.ticks_until_scroll, 4);
     assert_eq!(app.tick_count, 0);
@@ -120,7 +125,7 @@ mod tests {
 
   #[test]
   fn test_navigation_stack_methods() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let default_route = app.server_tabs.tabs.first().unwrap().route;
 
     assert_eq!(app.get_current_route(), default_route);
@@ -157,7 +162,7 @@ mod tests {
     let mut app = App {
       is_loading: true,
       should_refresh: false,
-      ..App::default()
+      ..App::test_default()
     };
     app.cancellation_token.cancel();
 
@@ -175,7 +180,7 @@ mod tests {
   fn test_reset_tick_count() {
     let mut app = App {
       tick_count: 2,
-      ..App::default()
+      ..App::test_default()
     };
 
     app.reset_tick_count();
@@ -202,7 +207,7 @@ mod tests {
       error: "Test error".to_owned().into(),
       is_first_render: false,
       data,
-      ..App::default()
+      ..App::test_default()
     };
 
     app.reset();
@@ -216,7 +221,7 @@ mod tests {
 
   #[test]
   fn test_handle_error() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let test_string = "Testing";
 
     app.handle_error(anyhow!(test_string));
@@ -235,7 +240,7 @@ mod tests {
     let mut app = App {
       tick_until_poll: 2,
       network_tx: Some(sync_network_tx),
-      ..App::default()
+      ..App::test_default()
     };
 
     assert_eq!(app.tick_count, 0);
@@ -259,7 +264,7 @@ mod tests {
       tick_until_poll: 2,
       network_tx: Some(sync_network_tx),
       is_first_render: true,
-      ..App::default()
+      ..App::test_default()
     };
 
     assert_eq!(app.tick_count, 0);
@@ -313,7 +318,7 @@ mod tests {
       tick_until_poll: 2,
       tick_count: 2,
       is_routing: true,
-      ..App::default()
+      ..App::test_default()
     };
 
     app.on_tick().await;
@@ -326,7 +331,7 @@ mod tests {
       tick_until_poll: 2,
       tick_count: 2,
       should_refresh: true,
-      ..App::default()
+      ..App::test_default()
     };
 
     app.on_tick().await;
@@ -345,7 +350,7 @@ mod tests {
   fn test_servarr_config_default() {
     let servarr_config = ServarrConfig::default();
 
-    assert!(servarr_config.name.is_empty());
+    assert_eq!(servarr_config.name, None);
     assert_eq!(servarr_config.host, Some("localhost".to_string()));
     assert_eq!(servarr_config.port, None);
     assert_eq!(servarr_config.uri, None);
@@ -356,21 +361,9 @@ mod tests {
   }
 
   #[test]
-  fn test_deserialize_env_var() {
-    std::env::set_var("TEST_VAR_DESERIALIZE", "testing");
-    let deserializer: StringDeserializer<serde_yaml::Error> =
-      "${TEST_VAR_DESERIALIZE}".to_owned().into_deserializer();
-
-    let env_var: Result<String, serde_yaml::Error> = deserialize_env_var(deserializer);
-
-    assert!(env_var.is_ok());
-    assert_str_eq!(env_var.unwrap(), "testing");
-    std::env::remove_var("TEST_VAR_DESERIALIZE");
-  }
-
-  #[test]
+  #[serial]
   fn test_deserialize_optional_env_var_is_present() {
-    std::env::set_var("TEST_VAR_DESERIALIZE_OPTION", "localhost");
+    unsafe { std::env::set_var("TEST_VAR_DESERIALIZE_OPTION", "localhost") };
     let yaml_data = r#"
       host: ${TEST_VAR_DESERIALIZE_OPTION}
       api_token: "test123"
@@ -379,12 +372,13 @@ mod tests {
     let config: ServarrConfig = serde_yaml::from_str(yaml_data).unwrap();
 
     assert_eq!(config.host, Some("localhost".to_string()));
-    std::env::remove_var("TEST_VAR_DESERIALIZE_OPTION");
+    unsafe { std::env::remove_var("TEST_VAR_DESERIALIZE_OPTION") };
   }
 
   #[test]
+  #[serial]
   fn test_deserialize_optional_env_var_does_not_overwrite_non_env_value() {
-    std::env::set_var("TEST_VAR_DESERIALIZE_OPTION_NO_OVERWRITE", "localhost");
+    unsafe { std::env::set_var("TEST_VAR_DESERIALIZE_OPTION_NO_OVERWRITE", "localhost") };
     let yaml_data = r#"
       host: www.example.com
       api_token: "test123"
@@ -393,7 +387,7 @@ mod tests {
     let config: ServarrConfig = serde_yaml::from_str(yaml_data).unwrap();
 
     assert_eq!(config.host, Some("www.example.com".to_string()));
-    std::env::remove_var("TEST_VAR_DESERIALIZE_OPTION_NO_OVERWRITE");
+    unsafe { std::env::remove_var("TEST_VAR_DESERIALIZE_OPTION_NO_OVERWRITE") };
   }
 
   #[test]
@@ -408,8 +402,9 @@ mod tests {
   }
 
   #[test]
+  #[serial]
   fn test_deserialize_optional_u16_env_var_is_present() {
-    std::env::set_var("TEST_VAR_DESERIALIZE_OPTION_U16", "1");
+    unsafe { std::env::set_var("TEST_VAR_DESERIALIZE_OPTION_U16", "1") };
     let yaml_data = r#"
       port: ${TEST_VAR_DESERIALIZE_OPTION_U16}
       api_token: "test123"
@@ -418,12 +413,13 @@ mod tests {
     let config: ServarrConfig = serde_yaml::from_str(yaml_data).unwrap();
 
     assert_eq!(config.port, Some(1));
-    std::env::remove_var("TEST_VAR_DESERIALIZE_OPTION_U16");
+    unsafe { std::env::remove_var("TEST_VAR_DESERIALIZE_OPTION_U16") };
   }
 
   #[test]
+  #[serial]
   fn test_deserialize_optional_u16_env_var_does_not_overwrite_non_env_value() {
-    std::env::set_var("TEST_VAR_DESERIALIZE_OPTION_U16_UNUSED", "1");
+    unsafe { std::env::set_var("TEST_VAR_DESERIALIZE_OPTION_U16_UNUSED", "1") };
     let yaml_data = r#"
       port: 1234
       api_token: "test123"
@@ -432,7 +428,7 @@ mod tests {
     let config: ServarrConfig = serde_yaml::from_str(yaml_data).unwrap();
 
     assert_eq!(config.port, Some(1234));
-    std::env::remove_var("TEST_VAR_DESERIALIZE_OPTION_U16_UNUSED");
+    unsafe { std::env::remove_var("TEST_VAR_DESERIALIZE_OPTION_U16_UNUSED") };
   }
 
   #[test]
@@ -460,13 +456,14 @@ mod tests {
   }
 
   #[test]
+  #[serial]
   fn test_interpolate_env_vars() {
-    std::env::set_var("TEST_VAR_INTERPOLATION", "testing");
+    unsafe { std::env::set_var("TEST_VAR_INTERPOLATION", "testing") };
 
     let var = interpolate_env_vars("${TEST_VAR_INTERPOLATION}");
 
     assert_str_eq!(var, "testing");
-    std::env::remove_var("TEST_VAR_INTERPOLATION");
+    unsafe { std::env::remove_var("TEST_VAR_INTERPOLATION") };
   }
 
   #[test]
@@ -477,13 +474,16 @@ mod tests {
   }
 
   #[test]
+  #[serial]
   fn test_interpolate_env_vars_scrubs_all_unnecessary_characters() {
-    std::env::set_var(
-      "TEST_VAR_INTERPOLATION_UNNECESSARY_CHARACTERS",
-      r#"""
+    unsafe {
+      std::env::set_var(
+        "TEST_VAR_INTERPOLATION_UNNECESSARY_CHARACTERS",
+        r#"""
 	        `"'https://dontdo:this@testing.com/query?test=%20query#results'"` {([\|$!])}
       """#,
-    );
+      )
+    };
 
     let var = interpolate_env_vars("${TEST_VAR_INTERPOLATION_UNNECESSARY_CHARACTERS}");
 
@@ -491,7 +491,7 @@ mod tests {
       var,
       "https://dontdo:this@testing.com/query?test=%20query#results"
     );
-    std::env::remove_var("TEST_VAR_INTERPOLATION_UNNECESSARY_CHARACTERS");
+    unsafe { std::env::remove_var("TEST_VAR_INTERPOLATION_UNNECESSARY_CHARACTERS") };
   }
 
   #[test]
@@ -514,10 +514,10 @@ mod tests {
     let api_token = "thisisatest".to_owned();
     let api_token_file = "/root/.config/api_token".to_owned();
     let ssl_cert_path = "/some/path".to_owned();
-    let expected_str = format!("ServarrConfig {{ name: \"{}\", host: Some(\"{}\"), port: Some({}), uri: Some(\"{}\"), weight: Some(\"{}\"), api_token: Some(\"***********\"), api_token_file: Some(\"{}\"), ssl_cert_path: Some(\"{}\") }}",
+    let expected_str = format!("ServarrConfig {{ name: Some(\"{}\"), host: Some(\"{}\"), port: Some({}), uri: Some(\"{}\"), weight: Some({}), api_token: Some(\"***********\"), api_token_file: Some(\"{}\"), ssl_cert_path: Some(\"{}\") }}",
     name, host, port, uri, weight, api_token_file, ssl_cert_path);
     let servarr_config = ServarrConfig {
-      name,
+      name: Some(name),
       host: Some(host),
       port: Some(port),
       uri: Some(uri),
diff --git a/src/app/mod.rs b/src/app/mod.rs
index 7dab0f2..6dee11c 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -51,16 +51,25 @@ impl App<'_> {
     cancellation_token: CancellationToken,
   ) -> Self {
     let mut server_tabs = Vec::new();
+    let help = format!(
+      "<↑↓> scroll | ←→ change tab | {}  ",
+      build_context_clue_string(&SERVARR_CONTEXT_CLUES)
+    );
 
     if let Some(radarr_configs) = config.radarr {
+      let mut idx = 0;
       for radarr_config in radarr_configs {
+        let name = if let Some(name) = radarr_config.name.clone() {
+          name
+        } else {
+          idx+=1;
+          format!("Radarr {}", idx)
+        };
+        
         server_tabs.push(TabRoute {
-          title: radarr_config.name.clone(),
+          title: name,
           route: ActiveRadarrBlock::Movies.into(),
-          help: format!(
-            "<↑↓> scroll | ←→ change tab | {}  ",
-            build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-          ),
+          help: help.clone(),
           contextual_help: None,
           config: Some(radarr_config),
         });
@@ -68,14 +77,20 @@ impl App<'_> {
     }
 
     if let Some(sonarr_configs) = config.sonarr {
+      let mut idx = 0;
+      
       for sonarr_config in sonarr_configs {
+        let name = if let Some(name) = sonarr_config.name.clone() {
+          name
+        } else {
+          idx+=1;
+          format!("Sonarr {}", idx)
+        };
+        
         server_tabs.push(TabRoute {
-          title: sonarr_config.name.clone(),
+          title: name,
           route: ActiveSonarrBlock::Series.into(),
-          help: format!(
-            "<↑↓> scroll | ←→ change tab | {}  ",
-            build_context_clue_string(&SERVARR_CONTEXT_CLUES)
-          ),
+          help: help.clone(),
           contextual_help: None,
           config: Some(sonarr_config),
         });
@@ -86,8 +101,8 @@ impl App<'_> {
       .into_iter()
       .sorted_by(|tab1, tab2| {
         Ord::cmp(
-          tab1.config.as_ref().unwrap().weight.as_ref().unwrap_or(&0),
-          tab2.config.as_ref().unwrap().weight.as_ref().unwrap_or(&0),
+          tab1.config.as_ref().unwrap().weight.as_ref().unwrap_or(&1000),
+          tab2.config.as_ref().unwrap().weight.as_ref().unwrap_or(&1000),
         )
       })
       .collect();
@@ -190,6 +205,24 @@ impl Default for App<'_> {
       cancellation_token: CancellationToken::new(),
       error: HorizontallyScrollableText::default(),
       is_first_render: true,
+      server_tabs: TabState::new(Vec::new()),
+      tick_until_poll: 400,
+      ticks_until_scroll: 4,
+      tick_count: 0,
+      is_loading: false,
+      is_routing: false,
+      should_refresh: false,
+      should_ignore_quit_key: false,
+      cli_mode: false,
+      data: Data::default(),
+    }
+  }
+}
+
+#[cfg(test)]
+impl App<'_> {
+  pub fn test_default() -> Self {
+    App {
       server_tabs: TabState::new(vec![
         TabRoute {
           title: "Radarr".to_owned(),
@@ -212,15 +245,7 @@ impl Default for App<'_> {
           config: Some(ServarrConfig::default()),
         },
       ]),
-      tick_until_poll: 400,
-      ticks_until_scroll: 4,
-      tick_count: 0,
-      is_loading: false,
-      is_routing: false,
-      should_refresh: false,
-      should_ignore_quit_key: false,
-      cli_mode: false,
-      data: Data::default(),
+      ..App::default()
     }
   }
 }
@@ -292,8 +317,8 @@ impl AppConfig {
 
 #[derive(Redact, Deserialize, Serialize, Clone, PartialEq, Eq)]
 pub struct ServarrConfig {
-  #[serde(default, deserialize_with = "deserialize_env_var")]
-  pub name: String,
+  #[serde(default, deserialize_with = "deserialize_optional_env_var")]
+  pub name: Option<String>,
   #[serde(default, deserialize_with = "deserialize_optional_env_var")]
   pub host: Option<String>,
   #[serde(default, deserialize_with = "deserialize_u16_env_var")]
@@ -313,11 +338,6 @@ pub struct ServarrConfig {
 
 impl ServarrConfig {
   fn validate(&self) {
-    if self.name.is_empty() {
-      log_and_print_error("'name' is required for configuration".to_owned());
-      process::exit(1);
-    }
-
     if self.host.is_none() && self.uri.is_none() {
       log_and_print_error("'host' or 'uri' is required for configuration".to_owned());
       process::exit(1);
@@ -352,7 +372,7 @@ impl ServarrConfig {
 impl Default for ServarrConfig {
   fn default() -> Self {
     ServarrConfig {
-      name: String::new(),
+      name: None,
       host: Some("localhost".to_string()),
       port: None,
       uri: None,
@@ -369,15 +389,6 @@ pub fn log_and_print_error(error: String) {
   eprintln!("error: {}", error.red());
 }
 
-fn deserialize_env_var<'de, D>(deserializer: D) -> Result<String, D::Error>
-where
-  D: serde::Deserializer<'de>,
-{
-  let s: String = String::deserialize(deserializer)?;
-  let interpolated = interpolate_env_vars(&s);
-  Ok(interpolated)
-}
-
 fn deserialize_optional_env_var<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
 where
   D: serde::Deserializer<'de>,
diff --git a/src/app/radarr/radarr_tests.rs b/src/app/radarr/radarr_tests.rs
index d1d1d2c..c37b819 100644
--- a/src/app/radarr/radarr_tests.rs
+++ b/src/app/radarr/radarr_tests.rs
@@ -467,7 +467,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_dispatch_by_cast_crew_blocks_cast_and_crew_non_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
 
     for active_radarr_block in &[ActiveRadarrBlock::Cast, ActiveRadarrBlock::Crew] {
       let mut movie_details_modal = MovieDetailsModal::default();
@@ -511,7 +511,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_dispatch_by_manual_search_block_movie_releases_non_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let mut movie_details_modal = MovieDetailsModal::default();
     movie_details_modal
       .movie_releases
@@ -531,7 +531,7 @@ mod tests {
   async fn test_dispatch_by_manual_search_block_is_loading() {
     let mut app = App {
       is_loading: true,
-      ..App::default()
+      ..App::test_default()
     };
 
     app
@@ -545,7 +545,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_check_for_radarr_prompt_action_no_prompt_confirm() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.prompt_confirm = false;
 
     app.check_for_radarr_prompt_action().await;
@@ -729,7 +729,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_populate_movie_collection_table_unfiltered() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.collections.set_items(vec![Collection {
       movies: Some(vec![CollectionMovie::default()]),
       ..Collection::default()
@@ -742,7 +742,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_populate_movie_collection_table_filtered() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app
       .data
       .radarr_data
@@ -759,7 +759,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_extract_movie_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.movies.set_items(vec![Movie {
       id: 1,
       ..Movie::default()
@@ -770,7 +770,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_extract_radarr_indexer_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.indexers.set_items(vec![Indexer {
       id: 1,
       ..Indexer::default()
@@ -785,7 +785,7 @@ mod tests {
       network_tx: Some(sync_network_tx),
       tick_count: 1,
       is_first_render: false,
-      ..App::default()
+      ..App::test_default()
     };
     app.data.radarr_data.prompt_confirm = true;
 
diff --git a/src/app/sonarr/sonarr_tests.rs b/src/app/sonarr/sonarr_tests.rs
index e2657e3..46c1382 100644
--- a/src/app/sonarr/sonarr_tests.rs
+++ b/src/app/sonarr/sonarr_tests.rs
@@ -185,7 +185,7 @@ mod tests {
     async fn test_dispatch_by_manual_season_search_block_is_loading() {
       let mut app = App {
         is_loading: true,
-        ..App::default()
+        ..App::test_default()
       };
 
       app
@@ -199,7 +199,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_dispatch_by_manual_season_search_block_season_releases_non_empty() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut season_details_modal = SeasonDetailsModal::default();
       season_details_modal
         .season_releases
@@ -304,7 +304,7 @@ mod tests {
     async fn test_dispatch_by_manual_episode_search_block_is_loading() {
       let mut app = App {
         is_loading: true,
-        ..App::default()
+        ..App::test_default()
       };
 
       app
@@ -318,7 +318,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_dispatch_by_manual_episode_search_block_episode_releases_non_empty() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut episode_details_modal = EpisodeDetailsModal::default();
       episode_details_modal
         .episode_releases
@@ -554,7 +554,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_check_for_sonarr_prompt_action_no_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.prompt_confirm = false;
 
       app.check_for_sonarr_prompt_action().await;
@@ -750,7 +750,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_populate_seasons_table_unfiltered() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.series.set_items(vec![Series {
         seasons: Some(vec![Season::default()]),
         ..Series::default()
@@ -770,7 +770,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_populate_seasons_table_filtered() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.series.set_filtered_items(vec![Series {
         seasons: Some(vec![Season::default()]),
         ..Series::default()
@@ -790,7 +790,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_extract_episode_id() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut season_details_modal = SeasonDetailsModal::default();
       season_details_modal.episodes.set_items(vec![Episode {
         id: 1,
@@ -804,14 +804,14 @@ mod tests {
     #[tokio::test]
     #[should_panic(expected = "Season details have not been loaded")]
     async fn test_extract_episode_id_requires_season_details_modal_to_be_some() {
-      let app = App::default();
+      let app = App::test_default();
 
       assert_eq!(app.extract_episode_id().await, 0);
     }
 
     #[tokio::test]
     async fn test_extract_series_id() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.series.set_items(vec![Series {
         id: 1,
         ..Series::default()
@@ -822,7 +822,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_extract_series_id_season_number_tuple() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.series.set_items(vec![Series {
         id: 1,
         ..Series::default()
@@ -837,7 +837,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_extract_add_new_series_search_query() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.add_series_search = Some("test search".into());
 
       assert_str_eq!(
@@ -849,14 +849,14 @@ mod tests {
     #[tokio::test]
     #[should_panic(expected = "Add series search is empty")]
     async fn test_extract_add_new_series_search_query_panics_when_the_query_is_not_set() {
-      let app = App::default();
+      let app = App::test_default();
 
       app.extract_add_new_series_search_query().await;
     }
 
     #[tokio::test]
     async fn test_extract_sonarr_indexer_id() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.indexers.set_items(vec![Indexer {
         id: 1,
         ..Indexer::default()
@@ -871,7 +871,7 @@ mod tests {
         network_tx: Some(sync_network_tx),
         tick_count: 1,
         is_first_render: false,
-        ..App::default()
+        ..App::test_default()
       };
       app.data.sonarr_data.prompt_confirm = true;
 
diff --git a/src/cli/cli_tests.rs b/src/cli/cli_tests.rs
index f58b6cd..0109905 100644
--- a/src/cli/cli_tests.rs
+++ b/src/cli/cli_tests.rs
@@ -136,7 +136,7 @@ mod tests {
           json!({"testResponse": "response"}),
         )))
       });
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let clear_blocklist_command = RadarrCommand::ClearBlocklist.into();
 
     let result = handle_command(&app_arc, clear_blocklist_command, &mut mock_network).await;
@@ -167,7 +167,7 @@ mod tests {
           json!({"testResponse": "response"}),
         )))
       });
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let clear_blocklist_command = SonarrCommand::ClearBlocklist.into();
 
     let result = handle_command(&app_arc, clear_blocklist_command, &mut mock_network).await;
diff --git a/src/cli/radarr/add_command_handler_tests.rs b/src/cli/radarr/add_command_handler_tests.rs
index edec9b6..3309a11 100644
--- a/src/cli/radarr/add_command_handler_tests.rs
+++ b/src/cli/radarr/add_command_handler_tests.rs
@@ -400,7 +400,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let add_movie_command = RadarrAddCommand::Movie {
         tmdb_id: 1,
         root_folder_path: "/test".to_owned(),
@@ -437,7 +437,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let add_root_folder_command = RadarrAddCommand::RootFolder {
         root_folder_path: expected_root_folder_path,
       };
@@ -465,7 +465,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let add_tag_command = RadarrAddCommand::Tag {
         name: expected_tag_name,
       };
diff --git a/src/cli/radarr/delete_command_handler_tests.rs b/src/cli/radarr/delete_command_handler_tests.rs
index ad1580e..3c47b50 100644
--- a/src/cli/radarr/delete_command_handler_tests.rs
+++ b/src/cli/radarr/delete_command_handler_tests.rs
@@ -276,7 +276,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_blocklist_item_command = RadarrDeleteCommand::BlocklistItem {
         blocklist_item_id: 1,
       };
@@ -307,7 +307,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_download_command = RadarrDeleteCommand::Download { download_id: 1 };
 
       let result =
@@ -333,7 +333,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_indexer_command = RadarrDeleteCommand::Indexer { indexer_id: 1 };
 
       let result =
@@ -363,7 +363,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_movie_command = RadarrDeleteCommand::Movie {
         movie_id: 1,
         delete_files_from_disk: true,
@@ -393,7 +393,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_root_folder_command = RadarrDeleteCommand::RootFolder { root_folder_id: 1 };
 
       let result =
@@ -419,7 +419,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_tag_command = RadarrDeleteCommand::Tag { tag_id: 1 };
 
       let result =
diff --git a/src/cli/radarr/edit_command_handler_tests.rs b/src/cli/radarr/edit_command_handler_tests.rs
index 850bcb5..f811691 100644
--- a/src/cli/radarr/edit_command_handler_tests.rs
+++ b/src/cli/radarr/edit_command_handler_tests.rs
@@ -865,7 +865,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_all_indexer_settings_command = RadarrEditCommand::AllIndexerSettings {
         allow_hardcoded_subs: true,
         disable_allow_hardcoded_subs: false,
@@ -936,7 +936,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_all_indexer_settings_command = RadarrEditCommand::AllIndexerSettings {
         allow_hardcoded_subs: false,
         disable_allow_hardcoded_subs: true,
@@ -1008,7 +1008,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_all_indexer_settings_command = RadarrEditCommand::AllIndexerSettings {
         allow_hardcoded_subs: false,
         disable_allow_hardcoded_subs: false,
@@ -1055,7 +1055,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_collection_command = RadarrEditCommand::Collection {
         collection_id: 1,
         enable_monitoring: true,
@@ -1097,7 +1097,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_collection_command = RadarrEditCommand::Collection {
         collection_id: 1,
         enable_monitoring: false,
@@ -1139,7 +1139,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_collection_command = RadarrEditCommand::Collection {
         collection_id: 1,
         enable_monitoring: false,
@@ -1187,7 +1187,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_indexer_command = RadarrEditCommand::Indexer {
         indexer_id: 1,
         name: Some("Test".to_owned()),
@@ -1241,7 +1241,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_indexer_command = RadarrEditCommand::Indexer {
         indexer_id: 1,
         name: Some("Test".to_owned()),
@@ -1295,7 +1295,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_indexer_command = RadarrEditCommand::Indexer {
         indexer_id: 1,
         name: Some("Test".to_owned()),
@@ -1345,7 +1345,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_movie_command = RadarrEditCommand::Movie {
         movie_id: 1,
         enable_monitoring: true,
@@ -1388,7 +1388,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_movie_command = RadarrEditCommand::Movie {
         movie_id: 1,
         enable_monitoring: false,
@@ -1431,7 +1431,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_movie_command = RadarrEditCommand::Movie {
         movie_id: 1,
         enable_monitoring: false,
diff --git a/src/cli/radarr/get_command_handler_tests.rs b/src/cli/radarr/get_command_handler_tests.rs
index 7742c07..6a3fec5 100644
--- a/src/cli/radarr/get_command_handler_tests.rs
+++ b/src/cli/radarr/get_command_handler_tests.rs
@@ -138,7 +138,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_all_indexer_settings_command = RadarrGetCommand::AllIndexerSettings;
 
       let result = RadarrGetCommandHandler::with(
@@ -164,7 +164,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_host_config_command = RadarrGetCommand::HostConfig;
 
       let result =
@@ -190,7 +190,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_movie_details_command = RadarrGetCommand::MovieDetails { movie_id: 1 };
 
       let result =
@@ -216,7 +216,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_movie_history_command = RadarrGetCommand::MovieHistory { movie_id: 1 };
 
       let result =
@@ -239,7 +239,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_security_config_command = RadarrGetCommand::SecurityConfig;
 
       let result =
@@ -262,7 +262,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_system_status_command = RadarrGetCommand::SystemStatus;
 
       let result =
diff --git a/src/cli/radarr/list_command_handler_tests.rs b/src/cli/radarr/list_command_handler_tests.rs
index 36f030d..781ccf4 100644
--- a/src/cli/radarr/list_command_handler_tests.rs
+++ b/src/cli/radarr/list_command_handler_tests.rs
@@ -147,7 +147,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
 
       let result = RadarrListCommandHandler::with(&app_arc, list_command, &mut mock_network)
         .handle()
@@ -171,7 +171,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_movie_credits_command = RadarrListCommand::MovieCredits { movie_id: 1 };
 
       let result =
@@ -197,7 +197,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_logs_command = RadarrListCommand::Logs {
         events: 1000,
         output_in_log_format: false,
diff --git a/src/cli/radarr/radarr_command_tests.rs b/src/cli/radarr/radarr_command_tests.rs
index 11a41b6..ace8826 100644
--- a/src/cli/radarr/radarr_command_tests.rs
+++ b/src/cli/radarr/radarr_command_tests.rs
@@ -292,7 +292,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let clear_blocklist_command = RadarrCommand::ClearBlocklist;
 
       let result = RadarrCliHandler::with(&app_arc, clear_blocklist_command, &mut mock_network)
@@ -321,7 +321,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let download_release_command = RadarrCommand::DownloadRelease {
         guid: "guid".to_owned(),
         indexer_id: 1,
@@ -350,7 +350,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let manual_search_command = RadarrCommand::ManualSearch { movie_id: 1 };
 
       let result = RadarrCliHandler::with(&app_arc, manual_search_command, &mut mock_network)
@@ -375,7 +375,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let search_new_movie_command = RadarrCommand::SearchNewMovie {
         query: "halo".to_owned(),
       };
@@ -402,7 +402,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let start_task_command = RadarrCommand::StartTask {
         task_name: RadarrTaskName::ApplicationCheckUpdate,
       };
@@ -429,7 +429,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let test_indexer_command = RadarrCommand::TestIndexer { indexer_id: 1 };
 
       let result = RadarrCliHandler::with(&app_arc, test_indexer_command, &mut mock_network)
@@ -451,7 +451,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let test_all_indexers_command = RadarrCommand::TestAllIndexers;
 
       let result = RadarrCliHandler::with(&app_arc, test_all_indexers_command, &mut mock_network)
@@ -476,7 +476,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let trigger_automatic_search_command = RadarrCommand::TriggerAutomaticSearch { movie_id: 1 };
 
       let result = RadarrCliHandler::with(
@@ -505,7 +505,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let add_tag_command = RadarrCommand::Add(RadarrAddCommand::Tag {
         name: expected_tag_name,
       });
@@ -532,7 +532,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_blocklist_item_command =
         RadarrCommand::Delete(RadarrDeleteCommand::BlocklistItem {
           blocklist_item_id: 1,
@@ -592,7 +592,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_all_indexer_settings_command =
         RadarrCommand::Edit(RadarrEditCommand::AllIndexerSettings {
           allow_hardcoded_subs: true,
@@ -632,7 +632,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_all_indexer_settings_command =
         RadarrCommand::Get(RadarrGetCommand::AllIndexerSettings);
 
@@ -662,7 +662,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_movie_credits_command =
         RadarrCommand::List(RadarrListCommand::MovieCredits { movie_id: 1 });
 
@@ -688,7 +688,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let refresh_movie_command =
         RadarrCommand::Refresh(RadarrRefreshCommand::Movie { movie_id: 1 });
 
diff --git a/src/cli/radarr/refresh_command_handler_tests.rs b/src/cli/radarr/refresh_command_handler_tests.rs
index 25fe01c..b363b2b 100644
--- a/src/cli/radarr/refresh_command_handler_tests.rs
+++ b/src/cli/radarr/refresh_command_handler_tests.rs
@@ -96,7 +96,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
 
       let result = RadarrRefreshCommandHandler::with(&app_arc, refresh_command, &mut mock_network)
         .handle()
@@ -120,7 +120,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let refresh_movie_command = RadarrRefreshCommand::Movie { movie_id: 1 };
 
       let result =
diff --git a/src/cli/sonarr/add_command_handler_tests.rs b/src/cli/sonarr/add_command_handler_tests.rs
index 862d6f7..94d65cd 100644
--- a/src/cli/sonarr/add_command_handler_tests.rs
+++ b/src/cli/sonarr/add_command_handler_tests.rs
@@ -491,7 +491,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let add_root_folder_command = SonarrAddCommand::RootFolder {
         root_folder_path: expected_root_folder_path,
       };
@@ -535,7 +535,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let add_series_command = SonarrAddCommand::Series {
         tvdb_id: 1,
         title: "test".to_owned(),
@@ -572,7 +572,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let add_tag_command = SonarrAddCommand::Tag {
         name: expected_tag_name,
       };
diff --git a/src/cli/sonarr/delete_command_handler_tests.rs b/src/cli/sonarr/delete_command_handler_tests.rs
index a0d32e2..fdae4c4 100644
--- a/src/cli/sonarr/delete_command_handler_tests.rs
+++ b/src/cli/sonarr/delete_command_handler_tests.rs
@@ -309,7 +309,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_blocklist_item_command = SonarrDeleteCommand::BlocklistItem {
         blocklist_item_id: 1,
       };
@@ -340,7 +340,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_download_command = SonarrDeleteCommand::Download { download_id: 1 };
 
       let result =
@@ -366,7 +366,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_episode_file_command = SonarrDeleteCommand::EpisodeFile { episode_file_id: 1 };
 
       let result =
@@ -392,7 +392,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_indexer_command = SonarrDeleteCommand::Indexer { indexer_id: 1 };
 
       let result =
@@ -418,7 +418,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_root_folder_command = SonarrDeleteCommand::RootFolder { root_folder_id: 1 };
 
       let result =
@@ -448,7 +448,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_series_command = SonarrDeleteCommand::Series {
         series_id: 1,
         delete_files_from_disk: true,
@@ -478,7 +478,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_tag_command = SonarrDeleteCommand::Tag { tag_id: 1 };
 
       let result =
diff --git a/src/cli/sonarr/download_command_handler_tests.rs b/src/cli/sonarr/download_command_handler_tests.rs
index c1a617b..f0a32b0 100644
--- a/src/cli/sonarr/download_command_handler_tests.rs
+++ b/src/cli/sonarr/download_command_handler_tests.rs
@@ -333,7 +333,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let download_release_command = SonarrDownloadCommand::Series {
         guid: "guid".to_owned(),
         indexer_id: 1,
@@ -369,7 +369,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let download_release_command = SonarrDownloadCommand::Season {
         guid: "guid".to_owned(),
         indexer_id: 1,
@@ -405,7 +405,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let download_release_command = SonarrDownloadCommand::Episode {
         guid: "guid".to_owned(),
         indexer_id: 1,
diff --git a/src/cli/sonarr/edit_command_handler_tests.rs b/src/cli/sonarr/edit_command_handler_tests.rs
index c388ed8..bc6ef89 100644
--- a/src/cli/sonarr/edit_command_handler_tests.rs
+++ b/src/cli/sonarr/edit_command_handler_tests.rs
@@ -658,7 +658,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_all_indexer_settings_command = SonarrEditCommand::AllIndexerSettings {
         maximum_size: Some(1),
         minimum_age: Some(1),
@@ -705,7 +705,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_indexer_command = SonarrEditCommand::Indexer {
         indexer_id: 1,
         name: Some("Test".to_owned()),
@@ -757,7 +757,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_series_command = SonarrEditCommand::Series {
         series_id: 1,
         enable_monitoring: true,
@@ -805,7 +805,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_series_command = SonarrEditCommand::Series {
         series_id: 1,
         enable_monitoring: false,
@@ -853,7 +853,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_series_command = SonarrEditCommand::Series {
         series_id: 1,
         enable_monitoring: false,
diff --git a/src/cli/sonarr/get_command_handler_tests.rs b/src/cli/sonarr/get_command_handler_tests.rs
index ad53be8..202b174 100644
--- a/src/cli/sonarr/get_command_handler_tests.rs
+++ b/src/cli/sonarr/get_command_handler_tests.rs
@@ -139,7 +139,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_all_indexer_settings_command = SonarrGetCommand::AllIndexerSettings;
 
       let result = SonarrGetCommandHandler::with(
@@ -168,7 +168,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_episode_details_command = SonarrGetCommand::EpisodeDetails { episode_id: 1 };
 
       let result =
@@ -191,7 +191,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_host_config_command = SonarrGetCommand::HostConfig;
 
       let result =
@@ -214,7 +214,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_security_config_command = SonarrGetCommand::SecurityConfig;
 
       let result =
@@ -240,7 +240,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_series_details_command = SonarrGetCommand::SeriesDetails { series_id: 1 };
 
       let result =
@@ -263,7 +263,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_system_status_command = SonarrGetCommand::SystemStatus;
 
       let result =
diff --git a/src/cli/sonarr/list_command_handler_tests.rs b/src/cli/sonarr/list_command_handler_tests.rs
index 866489a..4c10a77 100644
--- a/src/cli/sonarr/list_command_handler_tests.rs
+++ b/src/cli/sonarr/list_command_handler_tests.rs
@@ -313,7 +313,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
 
       let result = SonarrListCommandHandler::with(&app_arc, list_command, &mut mock_network)
         .handle()
@@ -337,7 +337,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_episodes_command = SonarrListCommand::Episodes { series_id: 1 };
 
       let result =
@@ -363,7 +363,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_episode_files_command = SonarrListCommand::EpisodeFiles { series_id: 1 };
 
       let result =
@@ -389,7 +389,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_history_command = SonarrListCommand::History { events: 1000 };
 
       let result =
@@ -415,7 +415,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_logs_command = SonarrListCommand::Logs {
         events: 1000,
         output_in_log_format: false,
@@ -443,7 +443,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_series_history_command = SonarrListCommand::SeriesHistory { series_id: 1 };
 
       let result =
@@ -469,7 +469,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_episode_history_command = SonarrListCommand::EpisodeHistory { episode_id: 1 };
 
       let result =
@@ -496,7 +496,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_season_history_command = SonarrListCommand::SeasonHistory {
         series_id: 1,
         season_number: 1,
diff --git a/src/cli/sonarr/manual_search_command_handler_tests.rs b/src/cli/sonarr/manual_search_command_handler_tests.rs
index 7141e01..453c5fc 100644
--- a/src/cli/sonarr/manual_search_command_handler_tests.rs
+++ b/src/cli/sonarr/manual_search_command_handler_tests.rs
@@ -138,7 +138,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let manual_episode_search_command = SonarrManualSearchCommand::Episode { episode_id: 1 };
 
       let result = SonarrManualSearchCommandHandler::with(
@@ -168,7 +168,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let manual_season_search_command = SonarrManualSearchCommand::Season {
         series_id: 1,
         season_number: 1,
diff --git a/src/cli/sonarr/refresh_command_handler_tests.rs b/src/cli/sonarr/refresh_command_handler_tests.rs
index 38e4057..01d0c2e 100644
--- a/src/cli/sonarr/refresh_command_handler_tests.rs
+++ b/src/cli/sonarr/refresh_command_handler_tests.rs
@@ -103,7 +103,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
 
       let result = SonarrRefreshCommandHandler::with(&app_arc, refresh_command, &mut mock_network)
         .handle()
@@ -127,7 +127,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let refresh_series_command = SonarrRefreshCommand::Series { series_id: 1 };
 
       let result =
diff --git a/src/cli/sonarr/sonarr_command_tests.rs b/src/cli/sonarr/sonarr_command_tests.rs
index 7078d08..dd92be7 100644
--- a/src/cli/sonarr/sonarr_command_tests.rs
+++ b/src/cli/sonarr/sonarr_command_tests.rs
@@ -272,7 +272,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let claer_blocklist_command = SonarrCommand::ClearBlocklist;
 
       let result = SonarrCliHandler::with(&app_arc, claer_blocklist_command, &mut mock_network)
@@ -297,7 +297,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let mark_history_item_as_failed_command =
         SonarrCommand::MarkHistoryItemAsFailed { history_item_id: 1 };
 
@@ -327,7 +327,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let add_tag_command = SonarrCommand::Add(SonarrAddCommand::Tag {
         name: expected_tag_name,
       });
@@ -354,7 +354,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let delete_blocklist_item_command =
         SonarrCommand::Delete(SonarrDeleteCommand::BlocklistItem {
           blocklist_item_id: 1,
@@ -388,7 +388,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let download_series_release_command =
         SonarrCommand::Download(SonarrDownloadCommand::Series {
           guid: "1234".to_owned(),
@@ -442,7 +442,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let edit_all_indexer_settings_command =
         SonarrCommand::Edit(SonarrEditCommand::AllIndexerSettings {
           maximum_size: Some(1),
@@ -478,7 +478,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let manual_episode_search_command =
         SonarrCommand::ManualSearch(SonarrManualSearchCommand::Episode { episode_id: 1 });
 
@@ -506,7 +506,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let manual_episode_search_command =
         SonarrCommand::TriggerAutomaticSearch(SonarrTriggerAutomaticSearchCommand::Episode {
           episode_id: 1,
@@ -532,7 +532,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let get_system_status_command = SonarrCommand::Get(SonarrGetCommand::SystemStatus);
 
       let result = SonarrCliHandler::with(&app_arc, get_system_status_command, &mut mock_network)
@@ -554,7 +554,7 @@ mod tests {
             Series::default(),
           ])))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let list_series_command = SonarrCommand::List(SonarrListCommand::Series);
 
       let result = SonarrCliHandler::with(&app_arc, list_series_command, &mut mock_network)
@@ -579,7 +579,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let refresh_series_command =
         SonarrCommand::Refresh(SonarrRefreshCommand::Series { series_id: 1 });
 
@@ -605,7 +605,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let search_new_series_command = SonarrCommand::SearchNewSeries {
         query: "halo".to_owned(),
       };
@@ -632,7 +632,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let start_task_command = SonarrCommand::StartTask {
         task_name: SonarrTaskName::ApplicationUpdateCheck,
       };
@@ -659,7 +659,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let test_indexer_command = SonarrCommand::TestIndexer { indexer_id: 1 };
 
       let result = SonarrCliHandler::with(&app_arc, test_indexer_command, &mut mock_network)
@@ -681,7 +681,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let test_all_indexers_command = SonarrCommand::TestAllIndexers;
 
       let result = SonarrCliHandler::with(&app_arc, test_all_indexers_command, &mut mock_network)
@@ -706,7 +706,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let toggle_episode_monitoring_command =
         SonarrCommand::ToggleEpisodeMonitoring { episode_id: 1 };
 
@@ -737,7 +737,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let toggle_season_monitoring_command = SonarrCommand::ToggleSeasonMonitoring {
         series_id: 1,
         season_number: 1,
diff --git a/src/cli/sonarr/trigger_automatic_search_command_handler_tests.rs b/src/cli/sonarr/trigger_automatic_search_command_handler_tests.rs
index 336ca6f..4ebeb56 100644
--- a/src/cli/sonarr/trigger_automatic_search_command_handler_tests.rs
+++ b/src/cli/sonarr/trigger_automatic_search_command_handler_tests.rs
@@ -174,7 +174,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let trigger_automatic_series_search_command =
         SonarrTriggerAutomaticSearchCommand::Series { series_id: 1 };
 
@@ -206,7 +206,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let trigger_automatic_season_search_command = SonarrTriggerAutomaticSearchCommand::Season {
         series_id: 1,
         season_number: 1,
@@ -238,7 +238,7 @@ mod tests {
             json!({"testResponse": "response"}),
           )))
         });
-      let app_arc = Arc::new(Mutex::new(App::default()));
+      let app_arc = Arc::new(Mutex::new(App::test_default()));
       let trigger_automatic_episode_search_command =
         SonarrTriggerAutomaticSearchCommand::Episode { episode_id: 1 };
 
diff --git a/src/handlers/handler_test_utils.rs b/src/handlers/handler_test_utils.rs
index ec6d7ef..64bfada 100644
--- a/src/handlers/handler_test_utils.rs
+++ b/src/handlers/handler_test_utils.rs
@@ -102,7 +102,7 @@ mod test_utils {
     ($func:ident, $handler:ident, $servarr_data:ident, $data_ref:ident, $block:expr, $context:expr) => {
       #[rstest]
       fn $func(#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key) {
-        let mut app = App::default();
+        let mut app = App::test_default();
         app.push_navigation_stack($block.into());
         app
           .data
@@ -129,7 +129,7 @@ mod test_utils {
     ($func:ident, $handler:ident, $servarr_data:ident, $data_ref:ident, $items:ident, $block:expr, $context:expr, $field:ident) => {
       #[rstest]
       fn $func(#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key) {
-        let mut app = App::default();
+        let mut app = App::test_default();
         app.push_navigation_stack($block.into());
         app
           .data
@@ -156,7 +156,7 @@ mod test_utils {
     ($func:ident, $handler:ident, $servarr_data:ident, $data_ref:ident, $items:expr, $block:expr, $context:expr, $field:ident) => {
       #[rstest]
       fn $func(#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key) {
-        let mut app = App::default();
+        let mut app = App::test_default();
         app.push_navigation_stack($block.into());
         app.data.$servarr_data.$data_ref.set_items($items);
 
@@ -179,7 +179,7 @@ mod test_utils {
     ($func:ident, $handler:ident, $servarr_data:ident, $data_ref:ident, $items:expr, $block:expr, $context:expr, $field:ident, $conversion_fn:ident) => {
       #[rstest]
       fn $func(#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key) {
-        let mut app = App::default();
+        let mut app = App::test_default();
         app.push_navigation_stack($block.into());
         app.data.$servarr_data.$data_ref.set_items($items);
 
@@ -217,7 +217,7 @@ mod test_utils {
     ($func:ident, $handler:ident, $servarr_data:ident, $data_ref:ident, $block:expr, $context:expr) => {
       #[test]
       fn $func() {
-        let mut app = App::default();
+        let mut app = App::test_default();
         app.push_navigation_stack($block.into());
         app.data.$servarr_data.$data_ref.set_items(vec![
           "Test 1".to_owned(),
@@ -244,7 +244,7 @@ mod test_utils {
     ($func:ident, $handler:ident, $servarr_data:ident, $data_ref:ident, $items:ident, $block:expr, $context:expr, $field:ident) => {
       #[test]
       fn $func() {
-        let mut app = App::default();
+        let mut app = App::test_default();
         app.push_navigation_stack($block.into());
         app
           .data
@@ -271,7 +271,7 @@ mod test_utils {
     ($func:ident, $handler:ident, $servarr_data:ident, $data_ref:ident, $items:expr, $block:expr, $context:expr, $field:ident) => {
       #[test]
       fn $func() {
-        let mut app = App::default();
+        let mut app = App::test_default();
         app.push_navigation_stack($block.into());
         app.data.$servarr_data.$data_ref.set_items($items);
 
@@ -294,7 +294,7 @@ mod test_utils {
     ($func:ident, $handler:ident, $servarr_data:ident, $data_ref:ident, $items:expr, $block:expr, $context:expr, $field:ident, $conversion_fn:ident) => {
       #[test]
       fn $func() {
-        let mut app = App::default();
+        let mut app = App::test_default();
         app.push_navigation_stack($block.into());
         app.data.$servarr_data.$data_ref.set_items($items);
 
@@ -330,7 +330,7 @@ mod test_utils {
   #[macro_export]
   macro_rules! test_handler_delegation {
     ($handler:ident, $base:expr, $active_block:expr) => {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.history.set_items(vec![
         $crate::models::sonarr_models::SonarrHistoryItem::default(),
       ]);
@@ -426,7 +426,7 @@ mod test_utils {
   #[macro_export]
   macro_rules! assert_delete_prompt {
     ($handler:ident, $block:expr, $expected_block:expr) => {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       $handler::new(DELETE_KEY, &mut app, $block, None).handle();
 
@@ -443,7 +443,7 @@ mod test_utils {
   #[macro_export]
   macro_rules! assert_refresh_key {
     ($handler:ident, $block:expr) => {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack($block.into());
 
       $handler::new(DEFAULT_KEYBINDINGS.refresh.key, &mut app, $block, None).handle();
diff --git a/src/handlers/handlers_tests.rs b/src/handlers/handlers_tests.rs
index 2115b3d..c4c9977 100644
--- a/src/handlers/handlers_tests.rs
+++ b/src/handlers/handlers_tests.rs
@@ -18,7 +18,7 @@ mod tests {
 
   #[test]
   fn test_handle_clear_errors() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.error = "test error".to_owned().into();
 
     handle_clear_errors(&mut app);
@@ -30,7 +30,7 @@ mod tests {
   #[case(ActiveRadarrBlock::Movies.into(), ActiveRadarrBlock::SearchMovie.into())]
   #[case(ActiveSonarrBlock::Series.into(), ActiveSonarrBlock::SearchSeries.into())]
   fn test_handle_events(#[case] base_block: Route, #[case] top_block: Route) {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(base_block);
     app.push_navigation_stack(top_block);
     app
@@ -56,7 +56,7 @@ mod tests {
   where
     T: Into<Route> + Copy,
   {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.error = "Test".into();
     app.server_tabs.set_index(index);
 
@@ -84,7 +84,7 @@ mod tests {
 
   #[rstest]
   fn test_handle_prompt_toggle_left_right_radarr(#[values(Key::Left, Key::Right)] key: Key) {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
 
     assert!(!app.data.radarr_data.prompt_confirm);
@@ -100,7 +100,7 @@ mod tests {
 
   #[rstest]
   fn test_handle_prompt_toggle_left_right_sonarr(#[values(Key::Left, Key::Right)] key: Key) {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Series.into());
 
     assert!(!app.data.sonarr_data.prompt_confirm);
diff --git a/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs b/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs
index 4916e00..d65f467 100644
--- a/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs
+++ b/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs
@@ -24,7 +24,7 @@ mod tests {
 
     #[test]
     fn test_delete_blocklist_item_prompt() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
 
       BlocklistHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle();
@@ -37,7 +37,7 @@ mod tests {
 
     #[test]
     fn test_delete_blocklist_item_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into());
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
@@ -56,7 +56,7 @@ mod tests {
 
     #[rstest]
     fn test_blocklist_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(3);
 
@@ -77,7 +77,7 @@ mod tests {
 
     #[rstest]
     fn test_blocklist_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(3);
 
@@ -108,7 +108,7 @@ mod tests {
       active_radarr_block: ActiveRadarrBlock,
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       BlocklistHandler::new(key, &mut app, active_radarr_block, None).handle();
 
@@ -132,7 +132,7 @@ mod tests {
 
     #[test]
     fn test_blocklist_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into());
 
@@ -146,7 +146,7 @@ mod tests {
 
     #[test]
     fn test_blocklist_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into());
@@ -172,7 +172,7 @@ mod tests {
       #[case] prompt_block: ActiveRadarrBlock,
       #[case] expected_action: RadarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
       app.data.radarr_data.prompt_confirm = true;
       app.push_navigation_stack(base_route.into());
@@ -196,7 +196,7 @@ mod tests {
       )]
       prompt_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into());
       app.push_navigation_stack(prompt_block.into());
@@ -232,7 +232,7 @@ mod tests {
       #[case] base_block: ActiveRadarrBlock,
       #[case] prompt_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(base_block.into());
       app.push_navigation_stack(prompt_block.into());
       app.data.radarr_data.prompt_confirm = true;
@@ -245,7 +245,7 @@ mod tests {
 
     #[test]
     fn test_esc_blocklist_item_details() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into());
       app.push_navigation_stack(ActiveRadarrBlock::BlocklistItemDetails.into());
 
@@ -262,7 +262,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into());
@@ -285,7 +285,7 @@ mod tests {
 
     #[test]
     fn test_refresh_blocklist_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into());
 
@@ -303,7 +303,7 @@ mod tests {
 
     #[test]
     fn test_refresh_blocklist_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into());
@@ -322,7 +322,7 @@ mod tests {
 
     #[test]
     fn test_clear_blocklist_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
 
       BlocklistHandler::new(
@@ -341,7 +341,7 @@ mod tests {
 
     #[test]
     fn test_clear_blocklist_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into());
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
@@ -373,7 +373,7 @@ mod tests {
       #[case] prompt_block: ActiveRadarrBlock,
       #[case] expected_action: RadarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(base_route.into());
       app.push_navigation_stack(prompt_block.into());
@@ -543,7 +543,7 @@ mod tests {
 
   #[test]
   fn test_extract_blocklist_item_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.blocklist.set_items(blocklist_vec());
 
     let blocklist_item_id = BlocklistHandler::new(
@@ -559,7 +559,7 @@ mod tests {
 
   #[test]
   fn test_blocklist_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = BlocklistHandler::new(
@@ -574,7 +574,7 @@ mod tests {
 
   #[test]
   fn test_blocklist_handler_not_ready_when_blocklist_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = BlocklistHandler::new(
@@ -589,7 +589,7 @@ mod tests {
 
   #[test]
   fn test_blocklist_handler_ready_when_not_loading_and_blocklist_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app
       .data
diff --git a/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs b/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs
index 95cc8a9..3d016da 100644
--- a/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs
+++ b/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs
@@ -27,7 +27,7 @@ mod tests {
 
     #[test]
     fn test_collection_details_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -104,7 +104,7 @@ mod tests {
 
     #[test]
     fn test_collection_details_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::CollectionDetails.into());
       app
@@ -130,7 +130,7 @@ mod tests {
 
     #[test]
     fn test_collection_details_submit_movie_already_in_library() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -166,7 +166,7 @@ mod tests {
 
     #[rstest]
     fn test_esc_collection_details(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app.push_navigation_stack(ActiveRadarrBlock::CollectionDetails.into());
@@ -193,7 +193,7 @@ mod tests {
 
     #[test]
     fn test_esc_view_movie_overview() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::CollectionDetails.into());
       app.push_navigation_stack(ActiveRadarrBlock::ViewMovieOverview.into());
 
@@ -237,7 +237,7 @@ mod tests {
 
     #[test]
     fn test_edit_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::CollectionDetails.into());
       let mut radarr_data = create_test_radarr_data();
@@ -280,7 +280,7 @@ mod tests {
 
   #[test]
   fn test_collection_details_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = CollectionDetailsHandler::new(
@@ -295,7 +295,7 @@ mod tests {
 
   #[test]
   fn test_collection_details_handler_not_ready_when_collection_movies_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = CollectionDetailsHandler::new(
@@ -310,7 +310,7 @@ mod tests {
 
   #[test]
   fn test_collection_details_handler_ready_when_not_loading_and_collection_movies_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app
       .data
diff --git a/src/handlers/radarr_handlers/collections/collections_handler_tests.rs b/src/handlers/radarr_handlers/collections/collections_handler_tests.rs
index 4e6f8ce..7fd2179 100644
--- a/src/handlers/radarr_handlers/collections/collections_handler_tests.rs
+++ b/src/handlers/radarr_handlers/collections/collections_handler_tests.rs
@@ -28,7 +28,7 @@ mod tests {
 
     #[rstest]
     fn test_collections_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(1);
 
@@ -49,7 +49,7 @@ mod tests {
 
     #[rstest]
     fn test_collections_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(1);
 
@@ -72,7 +72,7 @@ mod tests {
     fn test_left_right_update_all_collections_prompt_toggle(
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       CollectionsHandler::new(
         key,
@@ -107,7 +107,7 @@ mod tests {
 
     #[test]
     fn test_collections_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -124,7 +124,7 @@ mod tests {
 
     #[test]
     fn test_collections_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app
@@ -143,7 +143,7 @@ mod tests {
 
     #[test]
     fn test_update_all_collections_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -174,7 +174,7 @@ mod tests {
 
     #[test]
     fn test_update_all_collections_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -211,7 +211,7 @@ mod tests {
 
     #[test]
     fn test_update_all_collections_prompt_block_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app.push_navigation_stack(ActiveRadarrBlock::UpdateAllCollectionsPrompt.into());
       app.data.radarr_data.prompt_confirm = true;
@@ -233,7 +233,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
@@ -272,7 +272,7 @@ mod tests {
 
     #[test]
     fn test_collection_edit_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       let mut radarr_data = create_test_radarr_data();
@@ -303,7 +303,7 @@ mod tests {
 
     #[test]
     fn test_update_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -326,7 +326,7 @@ mod tests {
 
     #[test]
     fn test_update_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app
@@ -351,7 +351,7 @@ mod tests {
 
     #[test]
     fn test_refresh_collections_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app
         .data
@@ -376,7 +376,7 @@ mod tests {
 
     #[test]
     fn test_refresh_collections_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app
@@ -402,7 +402,7 @@ mod tests {
 
     #[test]
     fn test_update_all_collections_prompt_confirm_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -591,7 +591,7 @@ mod tests {
 
   #[test]
   fn test_collections_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = CollectionsHandler::new(
@@ -606,7 +606,7 @@ mod tests {
 
   #[test]
   fn test_collections_handler_not_ready_when_collections_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = CollectionsHandler::new(
@@ -621,7 +621,7 @@ mod tests {
 
   #[test]
   fn test_collections_handler_ready_when_not_loading_and_collections_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app
       .data
diff --git a/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs b/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs
index e854f67..f76f831 100644
--- a/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs
+++ b/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs
@@ -32,7 +32,7 @@ mod tests {
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
       let minimum_availability_vec = Vec::from_iter(MinimumAvailability::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app
         .data
@@ -94,7 +94,7 @@ mod tests {
     fn test_edit_collection_select_quality_profile_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app
         .data
@@ -148,7 +148,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_collection_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(EDIT_COLLECTION_SELECTION_BLOCKS);
@@ -174,7 +174,7 @@ mod tests {
     fn test_edit_collection_prompt_scroll_no_op_when_not_ready(
       #[values(Key::Up, Key::Down)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app.data.radarr_data.selected_block =
@@ -204,7 +204,7 @@ mod tests {
     #[test]
     fn test_edit_collection_select_minimum_availability_home_end() {
       let minimum_availability_vec = Vec::from_iter(MinimumAvailability::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app
         .data
@@ -258,7 +258,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_select_quality_profile_scroll() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app
         .data
@@ -316,7 +316,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_root_folder_path_input_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal {
         path: "Test".into(),
         ..EditCollectionModal::default()
@@ -376,7 +376,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       EditCollectionHandler::new(key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, None)
         .handle();
@@ -391,7 +391,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_root_folder_path_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal {
         path: "Test".into(),
         ..EditCollectionModal::default()
@@ -456,7 +456,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_root_folder_path_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.should_ignore_quit_key = true;
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal {
         path: "Test Path".into(),
@@ -491,7 +491,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app.push_navigation_stack(ActiveRadarrBlock::EditCollectionPrompt.into());
@@ -520,7 +520,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_confirm_prompt_prompt_confirmation_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut edit_collection_modal = EditCollectionModal {
         path: "/nfs/Test Path".into(),
         monitored: Some(false),
@@ -582,7 +582,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_confirm_prompt_prompt_confirmation_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
@@ -618,7 +618,7 @@ mod tests {
         ActiveRadarrBlock::EditCollectionPrompt,
         Some(ActiveRadarrBlock::Collections),
       ));
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(EDIT_COLLECTION_SELECTION_BLOCKS);
@@ -671,7 +671,7 @@ mod tests {
         ActiveRadarrBlock::EditCollectionPrompt,
         Some(ActiveRadarrBlock::Collections),
       ));
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(EDIT_COLLECTION_SELECTION_BLOCKS);
@@ -731,7 +731,7 @@ mod tests {
       #[case] selected_block: ActiveRadarrBlock,
       #[case] index: usize,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app.push_navigation_stack(
         (
@@ -772,7 +772,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app.push_navigation_stack(ActiveRadarrBlock::EditCollectionPrompt.into());
       app.push_navigation_stack(active_radarr_block.into());
@@ -808,7 +808,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_root_folder_path_input_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data = create_test_radarr_data();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
       app.should_ignore_quit_key = true;
@@ -832,7 +832,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_prompt_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
       app.push_navigation_stack(ActiveRadarrBlock::EditCollectionPrompt.into());
       app.data.radarr_data = create_test_radarr_data();
@@ -864,7 +864,7 @@ mod tests {
       active_radarr_block: ActiveRadarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data = create_test_radarr_data();
       app.push_navigation_stack(ActiveRadarrBlock::Collections.into());
@@ -893,7 +893,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_root_folder_path_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal {
         path: "Test".into(),
         ..EditCollectionModal::default()
@@ -922,7 +922,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_root_folder_path_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
 
       EditCollectionHandler::new(
@@ -948,7 +948,7 @@ mod tests {
 
     #[test]
     fn test_edit_collection_confirm_prompt_prompt_confirmation_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut edit_collection_modal = EditCollectionModal {
         path: "/nfs/Test Path".into(),
         monitored: Some(false),
@@ -1021,7 +1021,7 @@ mod tests {
 
   #[test]
   fn test_build_edit_collection_params() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let mut edit_collection_modal = EditCollectionModal {
       path: "/nfs/Test Path".into(),
       monitored: Some(false),
@@ -1065,7 +1065,7 @@ mod tests {
 
   #[test]
   fn test_edit_collection_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = EditCollectionHandler::new(
@@ -1080,7 +1080,7 @@ mod tests {
 
   #[test]
   fn test_edit_collection_handler_is_not_ready_when_edit_collection_modal_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = EditCollectionHandler::new(
@@ -1095,7 +1095,7 @@ mod tests {
 
   #[test]
   fn test_edit_collection_handler_is_ready_when_edit_collection_modal_is_some() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
 
diff --git a/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs b/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs
index cca2e2e..2efc8f2 100644
--- a/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs
+++ b/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs
@@ -21,7 +21,7 @@ mod tests {
 
     #[test]
     fn test_delete_download_prompt() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -38,7 +38,7 @@ mod tests {
 
     #[test]
     fn test_delete_download_prompt_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Downloads.into());
       app
@@ -61,7 +61,7 @@ mod tests {
 
     #[rstest]
     fn test_downloads_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(2);
 
@@ -85,7 +85,7 @@ mod tests {
 
     #[rstest]
     fn test_downloads_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(2);
 
@@ -113,7 +113,7 @@ mod tests {
       active_radarr_block: ActiveRadarrBlock,
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       DownloadsHandler::new(key, &mut app, active_radarr_block, None).handle();
 
@@ -151,7 +151,7 @@ mod tests {
       #[case] prompt_block: ActiveRadarrBlock,
       #[case] expected_action: RadarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -178,7 +178,7 @@ mod tests {
       #[case] base_route: ActiveRadarrBlock,
       #[case] prompt_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -210,7 +210,7 @@ mod tests {
       #[case] base_block: ActiveRadarrBlock,
       #[case] prompt_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(base_block.into());
       app.push_navigation_stack(prompt_block.into());
       app.data.radarr_data.prompt_confirm = true;
@@ -223,7 +223,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveRadarrBlock::Downloads.into());
@@ -246,7 +246,7 @@ mod tests {
 
     #[test]
     fn test_update_downloads_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -269,7 +269,7 @@ mod tests {
 
     #[test]
     fn test_update_downloads_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Downloads.into());
       app
@@ -291,7 +291,7 @@ mod tests {
 
     #[test]
     fn test_refresh_downloads_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -313,7 +313,7 @@ mod tests {
 
     #[test]
     fn test_refresh_downloads_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Downloads.into());
       app
@@ -350,7 +350,7 @@ mod tests {
       #[case] prompt_block: ActiveRadarrBlock,
       #[case] expected_action: RadarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -389,7 +389,7 @@ mod tests {
 
   #[test]
   fn test_extract_download_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app
       .data
       .radarr_data
@@ -409,7 +409,7 @@ mod tests {
 
   #[test]
   fn test_downloads_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = DownloadsHandler::new(
@@ -424,7 +424,7 @@ mod tests {
 
   #[test]
   fn test_downloads_handler_not_ready_when_downloads_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = DownloadsHandler::new(
@@ -439,7 +439,7 @@ mod tests {
 
   #[test]
   fn test_downloads_handler_ready_when_not_loading_and_downloads_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     app
diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs
index 25c667a..a8b0fce 100644
--- a/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs
+++ b/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs
@@ -25,7 +25,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_priority_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -101,7 +101,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.data.radarr_data.selected_block =
@@ -127,7 +127,7 @@ mod tests {
     fn test_edit_indexer_prompt_scroll_no_op_when_not_ready(
       #[values(Key::Up, Key::Down)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.is_loading = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
@@ -155,7 +155,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_name_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         name: "Test".into(),
@@ -207,7 +207,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_url_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         url: "Test".into(),
@@ -259,7 +259,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_api_key_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         api_key: "Test".into(),
@@ -311,7 +311,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_seed_ratio_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         seed_ratio: "Test".into(),
@@ -363,7 +363,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_tags_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         tags: "Test".into(),
@@ -430,7 +430,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
@@ -472,7 +472,7 @@ mod tests {
       #[case] left_block: ActiveRadarrBlock,
       #[case] right_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
@@ -525,7 +525,7 @@ mod tests {
       #[case] left_block: ActiveRadarrBlock,
       #[case] right_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(EDIT_INDEXER_NZB_SELECTION_BLOCKS);
@@ -555,7 +555,7 @@ mod tests {
     fn test_left_right_block_toggle_torren_empty_row_to_prompt_confirm(
       #[values(Key::Left, Key::Right)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
@@ -585,7 +585,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_name_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         name: "Test".into(),
@@ -637,7 +637,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_url_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         url: "Test".into(),
@@ -689,7 +689,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_api_key_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         api_key: "Test".into(),
@@ -741,7 +741,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_seed_ratio_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         seed_ratio: "Test".into(),
@@ -793,7 +793,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_tags_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         tags: "Test".into(),
@@ -861,7 +861,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
       app.data.radarr_data.selected_block =
@@ -889,7 +889,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_prompt_prompt_confirmation_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
       app.data.radarr_data.selected_block =
@@ -946,7 +946,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_prompt_prompt_confirmation_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
@@ -981,7 +981,7 @@ mod tests {
       #[case] starting_x: usize,
       #[case] block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
@@ -1007,7 +1007,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_priority_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
@@ -1032,7 +1032,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_toggle_enable_rss_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.data.radarr_data.selected_block =
@@ -1085,7 +1085,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_toggle_enable_automatic_search_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.data.radarr_data.selected_block =
@@ -1138,7 +1138,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_toggle_enable_interactive_search_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.data.radarr_data.selected_block =
@@ -1191,7 +1191,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_name_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.should_ignore_quit_key = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
@@ -1227,7 +1227,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_url_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.should_ignore_quit_key = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
@@ -1263,7 +1263,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_api_key_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.should_ignore_quit_key = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
@@ -1299,7 +1299,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_seed_ratio_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.should_ignore_quit_key = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
@@ -1335,7 +1335,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_tags_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.should_ignore_quit_key = true;
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
@@ -1382,7 +1382,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_prompt_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
@@ -1413,7 +1413,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
@@ -1442,7 +1442,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_name_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         name: "Test".into(),
@@ -1472,7 +1472,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_url_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         url: "Test".into(),
@@ -1502,7 +1502,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_api_key_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         api_key: "Test".into(),
@@ -1532,7 +1532,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_seed_ratio_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         seed_ratio: "Test".into(),
@@ -1562,7 +1562,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_tags_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal {
         tags: "Test".into(),
@@ -1592,7 +1592,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_name_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -1619,7 +1619,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_url_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -1646,7 +1646,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_api_key_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -1673,7 +1673,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_seed_ratio_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -1700,7 +1700,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_tags_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -1727,7 +1727,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_prompt_prompt_confirmation_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
       app.data.radarr_data.selected_block =
@@ -1795,7 +1795,7 @@ mod tests {
 
   #[test]
   fn test_build_edit_indexer_params() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let edit_indexer_modal = EditIndexerModal {
       name: "Test Update".into(),
       enable_rss: Some(false),
@@ -1837,7 +1837,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
     app.is_loading = true;
 
@@ -1853,7 +1853,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_handler_is_not_ready_when_edit_indexer_modal_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
     app.is_loading = false;
 
@@ -1869,7 +1869,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_handler_is_ready_when_edit_indexer_modal_is_some() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
     app.is_loading = false;
     app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
index a3ba029..7dfb325 100644
--- a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
+++ b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
@@ -26,7 +26,7 @@ mod tests {
 
     macro_rules! test_i64_counter_scroll_value {
       ($block:expr, $key:expr, $data_ref:ident, $negatives:literal) => {
-        let mut app = App::default();
+        let mut app = App::test_default();
         app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
 
         IndexerSettingsHandler::new($key, &mut app, $block, None).handle();
@@ -97,7 +97,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_settings_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
@@ -128,7 +128,7 @@ mod tests {
     fn test_edit_indexer_settings_prompt_scroll_no_op_when_not_ready(
       #[values(Key::Up, Key::Down)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
       app.data.radarr_data.selected_block =
@@ -213,7 +213,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_whiteliested_subtitle_tags_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexer_settings = Some(IndexerSettings {
         whitelisted_hardcoded_subs: "Test".into(),
         ..IndexerSettings::default()
@@ -276,7 +276,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.y = INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1;
@@ -329,7 +329,7 @@ mod tests {
       #[case] left_block: ActiveRadarrBlock,
       #[case] right_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.y = starting_y_index;
@@ -368,7 +368,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_whitelisted_subtitle_tags_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexer_settings = Some(IndexerSettings {
         whitelisted_hardcoded_subs: "Test".into(),
         ..IndexerSettings::default()
@@ -436,7 +436,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
       app.data.radarr_data.selected_block =
@@ -464,7 +464,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_prompt_prompt_confirmation_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
       app.data.radarr_data.selected_block =
@@ -496,7 +496,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_prompt_prompt_confirmation_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
@@ -529,7 +529,7 @@ mod tests {
       #[case] y_index: usize,
       #[case] x_index: usize,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
       app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
       app.data.radarr_data.selected_block =
@@ -555,7 +555,7 @@ mod tests {
     fn test_edit_indexer_settings_prompt_submit_selected_block_no_op_when_not_ready(
       #[values((0, 0), (1, 0), (2, 0), (0, 1), (1, 1))] index: (usize, usize),
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
       app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
@@ -583,7 +583,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_prompt_submit_whitelisted_subtitle_tags_input() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
       app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
       app.data.radarr_data.selected_block =
@@ -607,7 +607,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_toggle_prefer_indexer_flags_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
@@ -661,7 +661,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_toggle_allow_hardcoded_subs_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
       app.data.radarr_data.selected_block =
         BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
@@ -715,7 +715,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_whitelisted_subtitle_tags_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.should_ignore_quit_key = true;
       app.data.radarr_data.indexer_settings = Some(IndexerSettings {
         whitelisted_hardcoded_subs: "Test tags".into(),
@@ -761,7 +761,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
       app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
       app.push_navigation_stack(active_radarr_block.into());
@@ -787,7 +787,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_settings_prompt_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
@@ -808,7 +808,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_whitelisted_subtitle_tags_input_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(
         ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput.into(),
@@ -844,7 +844,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
@@ -874,7 +874,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_whitelisted_subtitle_tags_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexer_settings = Some(IndexerSettings {
         whitelisted_hardcoded_subs: "Test".into(),
         ..IndexerSettings::default()
@@ -903,7 +903,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_whitelisted_subtitle_tags_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
 
       IndexerSettingsHandler::new(
@@ -929,7 +929,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_prompt_prompt_confirmation_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
       app.data.radarr_data.selected_block =
@@ -972,7 +972,7 @@ mod tests {
 
   #[test]
   fn test_build_edit_indexer_settings_body() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.indexer_settings = Some(indexer_settings());
 
     let body = IndexerSettingsHandler::new(
@@ -989,7 +989,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_settings_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = IndexerSettingsHandler::new(
@@ -1004,7 +1004,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_settings_handler_not_ready_when_indexer_settings_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = IndexerSettingsHandler::new(
@@ -1019,7 +1019,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_settings_handler_ready_when_not_loading_and_indexer_settings_is_some() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
 
diff --git a/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs b/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs
index a4f0f1d..e1e562b 100644
--- a/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs
+++ b/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs
@@ -25,7 +25,7 @@ mod tests {
 
     #[test]
     fn test_delete_indexer_prompt() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -42,7 +42,7 @@ mod tests {
 
     #[test]
     fn test_delete_indexer_prompt_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app
@@ -65,7 +65,7 @@ mod tests {
 
     #[rstest]
     fn test_indexers_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(5);
 
@@ -89,7 +89,7 @@ mod tests {
 
     #[rstest]
     fn test_indexers_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(5);
 
@@ -112,7 +112,7 @@ mod tests {
     fn test_left_right_delete_indexer_prompt_toggle(
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       IndexersHandler::new(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle();
 
@@ -142,7 +142,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_submit(#[values(true, false)] torrent_protocol: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let protocol = if torrent_protocol {
         "torrent".to_owned()
       } else {
@@ -223,7 +223,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app
@@ -240,7 +240,7 @@ mod tests {
 
     #[test]
     fn test_delete_indexer_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexers.set_items(vec![indexer()]);
       app.data.radarr_data.prompt_confirm = true;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
@@ -264,7 +264,7 @@ mod tests {
 
     #[test]
     fn test_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -296,7 +296,7 @@ mod tests {
 
     #[rstest]
     fn test_delete_indexer_prompt_block_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
@@ -316,7 +316,7 @@ mod tests {
 
     #[rstest]
     fn test_test_indexer_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.indexer_test_errors = Some("test result".to_owned());
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
@@ -330,7 +330,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
@@ -355,7 +355,7 @@ mod tests {
 
     #[test]
     fn test_refresh_indexers_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -377,7 +377,7 @@ mod tests {
 
     #[test]
     fn test_refresh_indexers_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app
         .data
@@ -400,7 +400,7 @@ mod tests {
 
     #[test]
     fn test_indexer_settings_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -427,7 +427,7 @@ mod tests {
 
     #[test]
     fn test_indexer_settings_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app
@@ -449,7 +449,7 @@ mod tests {
 
     #[test]
     fn test_test_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -472,7 +472,7 @@ mod tests {
 
     #[test]
     fn test_test_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app
@@ -494,7 +494,7 @@ mod tests {
 
     #[test]
     fn test_test_all_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -517,7 +517,7 @@ mod tests {
 
     #[test]
     fn test_test_all_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app
@@ -539,7 +539,7 @@ mod tests {
 
     #[test]
     fn test_delete_indexer_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.indexers.set_items(vec![indexer()]);
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
@@ -635,7 +635,7 @@ mod tests {
 
   #[test]
   fn test_extract_indexer_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.indexers.set_items(vec![indexer()]);
 
     let indexer_id = IndexersHandler::new(
@@ -651,7 +651,7 @@ mod tests {
 
   #[test]
   fn test_indexers_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = IndexersHandler::new(
@@ -666,7 +666,7 @@ mod tests {
 
   #[test]
   fn test_indexers_handler_not_ready_when_indexers_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = IndexersHandler::new(
@@ -681,7 +681,7 @@ mod tests {
 
   #[test]
   fn test_indexers_handler_ready_when_not_loading_and_indexers_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app
       .data
diff --git a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs
index 866b7de..bd84171 100644
--- a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs
+++ b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs
@@ -17,7 +17,7 @@ mod tests {
 
     #[rstest]
     fn test_test_all_indexers_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveRadarrBlock::TestAllIndexers.into());
@@ -50,7 +50,7 @@ mod tests {
 
   #[test]
   fn test_test_all_indexers_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = TestAllIndexersHandler::new(
@@ -65,7 +65,7 @@ mod tests {
 
   #[test]
   fn test_test_all_indexers_handler_is_not_ready_when_results_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = TestAllIndexersHandler::new(
@@ -80,7 +80,7 @@ mod tests {
 
   #[test]
   fn test_test_all_indexers_handler_is_not_ready_when_results_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app.data.radarr_data.indexer_test_all_results = Some(StatefulTable::default());
 
@@ -96,7 +96,7 @@ mod tests {
 
   #[test]
   fn test_test_all_indexers_handler_is_ready_when_results_is_not_empty_and_is_loaded() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     let mut indexer_test_results = StatefulTable::default();
     indexer_test_results.set_items(vec![IndexerTestResultModalItem::default()]);
diff --git a/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs b/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs
index ec4cf48..8be52b8 100644
--- a/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs
+++ b/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs
@@ -37,7 +37,7 @@ mod tests {
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
       let monitor_vec = Vec::from_iter(MovieMonitor::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app
         .data
@@ -100,7 +100,7 @@ mod tests {
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
       let minimum_availability_vec = Vec::from_iter(MinimumAvailability::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app
         .data
@@ -162,7 +162,7 @@ mod tests {
     fn test_add_movie_select_quality_profile_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app
         .data
@@ -218,7 +218,7 @@ mod tests {
     fn test_add_movie_select_root_folder_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app
         .data
@@ -274,7 +274,7 @@ mod tests {
 
     #[rstest]
     fn test_add_movie_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.selected_block = BlockSelectionState::new(ADD_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.down();
 
@@ -295,7 +295,7 @@ mod tests {
 
     #[rstest]
     fn test_add_movie_prompt_scroll_no_op_when_not_ready(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.selected_block = BlockSelectionState::new(ADD_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.down();
@@ -322,7 +322,7 @@ mod tests {
     #[test]
     fn test_add_movie_select_monitor_home_end() {
       let monitor_vec = Vec::from_iter(MovieMonitor::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app
         .data
@@ -377,7 +377,7 @@ mod tests {
     #[test]
     fn test_add_movie_select_minimum_availability_home_end() {
       let minimum_availability_vec = Vec::from_iter(MinimumAvailability::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app
         .data
@@ -431,7 +431,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_select_quality_profile_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app
         .data
@@ -489,7 +489,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_select_root_folder_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app
         .data
@@ -545,7 +545,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_search_input_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_search = Some("Test".into());
 
       AddMovieHandler::new(
@@ -591,7 +591,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_tags_input_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal {
         tags: "Test".into(),
         ..AddMovieModal::default()
@@ -651,7 +651,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       AddMovieHandler::new(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle();
 
@@ -664,7 +664,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_search_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_search = Some("Test".into());
 
       AddMovieHandler::new(
@@ -710,7 +710,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_tags_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal {
         tags: "Test".into(),
         ..AddMovieModal::default()
@@ -781,7 +781,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_search_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.should_ignore_quit_key = true;
       app.data.radarr_data.add_movie_search = Some("test".into());
 
@@ -802,7 +802,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_search_input_submit_noop_on_empty_search() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
       app.should_ignore_quit_key = true;
@@ -824,7 +824,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_search_results_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut add_searched_movies = StatefulTable::default();
       add_searched_movies.set_items(vec![AddMovieSearchResult::default()]);
       app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
@@ -890,7 +890,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_search_results_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into());
       let mut add_searched_movies = StatefulTable::default();
@@ -913,7 +913,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_search_results_submit_does_nothing_on_empty_table() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into());
       AddMovieHandler::new(
         SUBMIT_KEY,
@@ -931,7 +931,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_search_results_submit_movie_already_in_library() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut add_searched_movies = StatefulTable::default();
       add_searched_movies.set_items(vec![AddMovieSearchResult::default()]);
       app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
@@ -957,7 +957,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
       app.data.radarr_data.selected_block = BlockSelectionState::new(ADD_MOVIE_SELECTION_BLOCKS);
@@ -983,7 +983,7 @@ mod tests {
     fn test_add_movie_confirm_prompt_prompt_confirmation_submit(
       #[values(true, false)] movie_details_context: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
@@ -1067,7 +1067,7 @@ mod tests {
       #[case] selected_block: ActiveRadarrBlock,
       #[case] y_index: usize,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(
         (
           ActiveRadarrBlock::AddMoviePrompt,
@@ -1108,7 +1108,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
       app.push_navigation_stack(active_radarr_block.into());
 
@@ -1146,7 +1146,7 @@ mod tests {
 
     #[rstest]
     fn test_add_movie_search_input_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data = create_test_radarr_data();
       app.should_ignore_quit_key = true;
@@ -1167,7 +1167,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_input_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data = create_test_radarr_data();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
@@ -1196,7 +1196,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
       app.push_navigation_stack(active_radarr_block.into());
       let mut add_searched_movies = StatefulTable::default();
@@ -1218,7 +1218,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_already_in_library_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data = create_test_radarr_data();
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieAlreadyInLibrary.into());
@@ -1239,7 +1239,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_prompt_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app.data.radarr_data = create_test_radarr_data();
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into());
@@ -1257,7 +1257,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_tags_input_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data = create_test_radarr_data();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
@@ -1288,7 +1288,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(
         (
           ActiveRadarrBlock::AddMoviePrompt,
@@ -1343,7 +1343,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_search_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_search = Some("Test".into());
 
       AddMovieHandler::new(
@@ -1362,7 +1362,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_tags_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal {
         tags: "Test".into(),
         ..AddMovieModal::default()
@@ -1391,7 +1391,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_search_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
 
       AddMovieHandler::new(
@@ -1410,7 +1410,7 @@ mod tests {
 
     #[test]
     fn test_add_movie_tags_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
 
       AddMovieHandler::new(
@@ -1438,7 +1438,7 @@ mod tests {
     fn test_add_movie_confirm_prompt_prompt_confirmation_confirm(
       #[values(true, false)] movie_details_context: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
@@ -1525,7 +1525,7 @@ mod tests {
 
   #[test]
   fn test_add_movie_search_no_panic_on_none_search_result() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.add_searched_movies = None;
 
     AddMovieHandler::new(
@@ -1539,7 +1539,7 @@ mod tests {
 
   #[rstest]
   fn test_build_add_movie_body(#[values(true, false)] movie_details_context: bool) {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let mut add_movie_modal = AddMovieModal {
       tags: "usenet, testing".into(),
       ..AddMovieModal::default()
@@ -1599,7 +1599,7 @@ mod tests {
 
   #[test]
   fn test_add_movie_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = AddMovieHandler::new(
@@ -1614,7 +1614,7 @@ mod tests {
 
   #[test]
   fn test_add_movie_handler_is_ready_when_not_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = AddMovieHandler::new(
diff --git a/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs b/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs
index b127720..151c105 100644
--- a/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs
+++ b/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs
@@ -23,7 +23,7 @@ mod tests {
 
     #[rstest]
     fn test_delete_movie_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.selected_block = BlockSelectionState::new(DELETE_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.down();
 
@@ -46,7 +46,7 @@ mod tests {
     fn test_delete_movie_prompt_scroll_no_op_when_not_ready(
       #[values(Key::Up, Key::Down)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.selected_block = BlockSelectionState::new(DELETE_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.down();
@@ -67,7 +67,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       DeleteMovieHandler::new(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle();
 
@@ -92,7 +92,7 @@ mod tests {
 
     #[test]
     fn test_delete_movie_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::DeleteMoviePrompt.into());
       app.data.radarr_data.selected_block = BlockSelectionState::new(DELETE_MOVIE_SELECTION_BLOCKS);
@@ -121,7 +121,7 @@ mod tests {
 
     #[test]
     fn test_delete_movie_confirm_prompt_prompt_confirmation_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let expected_delete_movie_params = DeleteMovieParams {
         id: 1,
         delete_movie_files: true,
@@ -161,7 +161,7 @@ mod tests {
 
     #[test]
     fn test_delete_movie_confirm_prompt_prompt_confirmation_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::DeleteMoviePrompt.into());
@@ -191,7 +191,7 @@ mod tests {
     #[test]
     fn test_delete_movie_toggle_delete_files_submit() {
       let current_route = ActiveRadarrBlock::DeleteMoviePrompt.into();
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.selected_block = BlockSelectionState::new(DELETE_MOVIE_SELECTION_BLOCKS);
       app.push_navigation_stack(ActiveRadarrBlock::DeleteMoviePrompt.into());
 
@@ -228,7 +228,7 @@ mod tests {
 
     #[rstest]
     fn test_delete_movie_prompt_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::DeleteMoviePrompt.into());
@@ -264,7 +264,7 @@ mod tests {
 
     #[test]
     fn test_delete_movie_confirm_prompt_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let expected_delete_movie_params = DeleteMovieParams {
         id: 1,
         delete_movie_files: true,
@@ -315,7 +315,7 @@ mod tests {
 
   #[test]
   fn test_build_delete_movie_params() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.movies.set_items(vec![movie()]);
     app.data.radarr_data.delete_movie_files = true;
     app.data.radarr_data.add_list_exclusion = true;
@@ -340,7 +340,7 @@ mod tests {
 
   #[test]
   fn test_delete_movie_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = DeleteMovieHandler::new(
@@ -355,7 +355,7 @@ mod tests {
 
   #[test]
   fn test_delete_movie_handler_ready_when_not_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = DeleteMovieHandler::new(
diff --git a/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs b/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs
index 478ff37..eac5fe9 100644
--- a/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs
+++ b/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs
@@ -30,7 +30,7 @@ mod tests {
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
       let minimum_availability_vec = Vec::from_iter(MinimumAvailability::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app
         .data
@@ -92,7 +92,7 @@ mod tests {
     fn test_edit_movie_select_quality_profile_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app
         .data
@@ -146,7 +146,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_movie_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app.data.radarr_data.selected_block = BlockSelectionState::new(EDIT_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.down();
@@ -168,7 +168,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_movie_prompt_scroll_no_op_when_not_ready(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app.data.radarr_data.selected_block = BlockSelectionState::new(EDIT_MOVIE_SELECTION_BLOCKS);
@@ -195,7 +195,7 @@ mod tests {
     #[test]
     fn test_edit_movie_select_minimum_availability_home_end() {
       let minimum_availability_vec = Vec::from_iter(MinimumAvailability::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app
         .data
@@ -249,7 +249,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_select_quality_profile_scroll() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app
         .data
@@ -307,7 +307,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_path_input_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
         path: "Test".into(),
         ..EditMovieModal::default()
@@ -358,7 +358,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_tags_input_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
         tags: "Test".into(),
         ..EditMovieModal::default()
@@ -418,7 +418,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       EditMovieHandler::new(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle();
 
@@ -431,7 +431,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_path_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
         path: "Test".into(),
         ..EditMovieModal::default()
@@ -482,7 +482,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_tags_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
         tags: "Test".into(),
         ..EditMovieModal::default()
@@ -547,7 +547,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_path_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.should_ignore_quit_key = true;
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
         path: "Test Path".into(),
@@ -582,7 +582,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_tags_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.should_ignore_quit_key = true;
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
         tags: "Test Tags".into(),
@@ -617,7 +617,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
@@ -642,7 +642,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_confirm_prompt_prompt_confirmation_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut edit_movie = EditMovieModal {
         tags: "usenet, testing".to_owned().into(),
         path: "/nfs/Test Path".to_owned().into(),
@@ -700,7 +700,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_confirm_prompt_prompt_confirmation_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
@@ -729,7 +729,7 @@ mod tests {
         ActiveRadarrBlock::EditMoviePrompt,
         Some(ActiveRadarrBlock::Movies),
       ));
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app.data.radarr_data.selected_block = BlockSelectionState::new(EDIT_MOVIE_SELECTION_BLOCKS);
       app.push_navigation_stack(current_route);
@@ -784,7 +784,7 @@ mod tests {
       #[case] selected_block: ActiveRadarrBlock,
       #[case] y_index: usize,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app.push_navigation_stack(
         (
@@ -821,7 +821,7 @@ mod tests {
     fn test_edit_movie_prompt_selected_block_submit_no_op_when_not_ready(
       #[values(1, 2, 3, 4)] y_index: usize,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app.push_navigation_stack(
@@ -864,7 +864,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
       app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
       app.push_navigation_stack(active_radarr_block.into());
@@ -909,7 +909,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data = create_test_radarr_data();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
@@ -926,7 +926,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_prompt_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
       app.data.radarr_data = create_test_radarr_data();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
@@ -948,7 +948,7 @@ mod tests {
       active_radarr_block: ActiveRadarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data = create_test_radarr_data();
       app.push_navigation_stack(active_radarr_block.into());
@@ -971,7 +971,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_path_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
         path: "Test".into(),
         ..EditMovieModal::default()
@@ -1000,7 +1000,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_tags_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal {
         tags: "Test".into(),
         ..EditMovieModal::default()
@@ -1029,7 +1029,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_path_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
 
       EditMovieHandler::new(
@@ -1055,7 +1055,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_tags_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
 
       EditMovieHandler::new(
@@ -1081,7 +1081,7 @@ mod tests {
 
     #[test]
     fn test_edit_movie_confirm_prompt_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut edit_movie = EditMovieModal {
         tags: "usenet, testing".to_owned().into(),
         path: "/nfs/Test Path".to_owned().into(),
@@ -1150,7 +1150,7 @@ mod tests {
 
   #[test]
   fn test_build_edit_movie_params() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let mut edit_movie = EditMovieModal {
       tags: "usenet, testing".to_owned().into(),
       path: "/nfs/Test Path".to_owned().into(),
@@ -1194,7 +1194,7 @@ mod tests {
 
   #[test]
   fn test_edit_movie_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = EditMovieHandler::new(
@@ -1209,7 +1209,7 @@ mod tests {
 
   #[test]
   fn test_edit_movie_handler_is_not_ready_when_edit_movie_modal_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = EditMovieHandler::new(
@@ -1224,7 +1224,7 @@ mod tests {
 
   #[test]
   fn test_edit_movie_handler_is_ready_when_edit_movie_modal_is_some() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
 
diff --git a/src/handlers/radarr_handlers/library/library_handler_tests.rs b/src/handlers/radarr_handlers/library/library_handler_tests.rs
index ea62099..5117095 100644
--- a/src/handlers/radarr_handlers/library/library_handler_tests.rs
+++ b/src/handlers/radarr_handlers/library/library_handler_tests.rs
@@ -30,7 +30,7 @@ mod tests {
 
     #[test]
     fn test_movies_delete() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -51,7 +51,7 @@ mod tests {
 
     #[test]
     fn test_movies_delete_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app
@@ -74,7 +74,7 @@ mod tests {
 
     #[rstest]
     fn test_movie_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(0);
 
@@ -95,7 +95,7 @@ mod tests {
 
     #[rstest]
     fn test_movie_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(0);
 
@@ -121,7 +121,7 @@ mod tests {
     fn test_left_right_update_all_movies_prompt_toggle(
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       LibraryHandler::new(
         key,
@@ -156,7 +156,7 @@ mod tests {
 
     #[test]
     fn test_movie_details_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -173,7 +173,7 @@ mod tests {
 
     #[test]
     fn test_movie_details_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app
@@ -189,7 +189,7 @@ mod tests {
 
     #[test]
     fn test_update_all_movies_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -217,7 +217,7 @@ mod tests {
 
     #[test]
     fn test_update_all_movies_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -253,7 +253,7 @@ mod tests {
 
     #[test]
     fn test_update_all_movies_prompt_blocks_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::UpdateAllMoviesPrompt.into());
       app.data.radarr_data.prompt_confirm = true;
@@ -272,7 +272,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
@@ -312,7 +312,7 @@ mod tests {
 
     #[test]
     fn test_movie_add_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -337,7 +337,7 @@ mod tests {
 
     #[test]
     fn test_movie_add_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app
@@ -370,7 +370,7 @@ mod tests {
 
     #[test]
     fn test_movie_edit_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app
@@ -393,7 +393,7 @@ mod tests {
 
     #[test]
     fn test_update_all_movies_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -416,7 +416,7 @@ mod tests {
 
     #[test]
     fn test_update_all_movies_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app
@@ -438,7 +438,7 @@ mod tests {
 
     #[test]
     fn test_refresh_movies_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -460,7 +460,7 @@ mod tests {
 
     #[test]
     fn test_refresh_movies_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app
         .data
@@ -483,7 +483,7 @@ mod tests {
 
     #[test]
     fn test_update_all_movies_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -779,7 +779,7 @@ mod tests {
 
   #[test]
   fn test_library_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = LibraryHandler::new(
@@ -794,7 +794,7 @@ mod tests {
 
   #[test]
   fn test_library_handler_not_ready_when_movies_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = LibraryHandler::new(
@@ -809,7 +809,7 @@ mod tests {
 
   #[test]
   fn test_library_handler_ready_when_not_loading_and_movies_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app
       .data
diff --git a/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs b/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs
index 2a686c5..c7332e6 100644
--- a/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs
+++ b/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs
@@ -31,7 +31,7 @@ mod tests {
 
     #[test]
     fn test_movie_details_scroll() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal {
         movie_details: ScrollableText::with_string("Test 1\nTest 2".to_owned()),
         ..MovieDetailsModal::default()
@@ -80,7 +80,7 @@ mod tests {
 
     #[test]
     fn test_movie_details_scroll_no_op_if_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal {
         movie_details: ScrollableText::with_string("Test 1\nTest 2".to_owned()),
@@ -137,7 +137,7 @@ mod tests {
 
     #[test]
     fn test_movie_details_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let movie_details_modal = MovieDetailsModal {
         movie_details: ScrollableText::with_string("Test 1\nTest 2".to_owned()),
         ..MovieDetailsModal::default()
@@ -187,7 +187,7 @@ mod tests {
 
     #[test]
     fn test_movie_details_home_end_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       let movie_details_modal = MovieDetailsModal {
         movie_details: ScrollableText::with_string("Test 1\nTest 2".to_owned()),
@@ -253,7 +253,7 @@ mod tests {
       active_radarr_block: ActiveRadarrBlock,
       #[values(Key::Left, Key::Right)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       MovieDetailsHandler::new(key, &mut app, active_radarr_block, None).handle();
 
@@ -276,7 +276,7 @@ mod tests {
       #[case] right_block: ActiveRadarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(right_block.into());
       app.data.radarr_data.movie_info_tabs.index = app
@@ -319,7 +319,7 @@ mod tests {
 
     #[test]
     fn test_manual_search_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut modal = MovieDetailsModal {
         movie_details: ScrollableText::with_string("test".to_owned()),
         ..MovieDetailsModal::default()
@@ -341,7 +341,7 @@ mod tests {
 
     #[test]
     fn test_manual_search_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal {
         movie_details: ScrollableText::with_string("test".to_owned()),
@@ -376,7 +376,7 @@ mod tests {
       #[case] prompt_block: ActiveRadarrBlock,
       #[case] expected_action: RadarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut movie_details_modal = MovieDetailsModal {
         movie_details: ScrollableText::with_string("test".to_owned()),
         ..MovieDetailsModal::default()
@@ -412,7 +412,7 @@ mod tests {
       )]
       prompt_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal {
         movie_details: ScrollableText::with_string("test".to_owned()),
         ..MovieDetailsModal::default()
@@ -455,7 +455,7 @@ mod tests {
       active_radarr_block: ActiveRadarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data = create_test_radarr_data();
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
@@ -477,7 +477,7 @@ mod tests {
       prompt_block: ActiveRadarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data = create_test_radarr_data();
       app.is_loading = is_ready;
       app.data.radarr_data.prompt_confirm = true;
@@ -521,7 +521,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut modal = MovieDetailsModal {
         movie_details: ScrollableText::with_string("Test".to_owned()),
         ..MovieDetailsModal::default()
@@ -562,7 +562,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal {
@@ -612,7 +612,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal {
@@ -644,7 +644,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut modal = MovieDetailsModal {
         movie_details: ScrollableText::with_string("Test".to_owned()),
         ..MovieDetailsModal::default()
@@ -685,7 +685,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(active_radarr_block.into());
       app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal {
@@ -716,7 +716,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut modal = MovieDetailsModal {
         movie_details: ScrollableText::with_string("Test".to_owned()),
         ..MovieDetailsModal::default()
@@ -755,7 +755,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(active_radarr_block.into());
       app.is_routing = false;
@@ -794,7 +794,7 @@ mod tests {
       #[case] prompt_block: ActiveRadarrBlock,
       #[case] expected_action: RadarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut movie_details_modal = MovieDetailsModal {
         movie_details: ScrollableText::with_string("test".to_owned()),
         ..MovieDetailsModal::default()
@@ -830,7 +830,7 @@ mod tests {
 
   #[test]
   fn test_build_radarr_release_download_body() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let mut movie_details_modal = MovieDetailsModal::default();
     movie_details_modal
       .movie_releases
@@ -856,7 +856,7 @@ mod tests {
 
   #[test]
   fn test_extract_movie_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.movies.set_items(vec![movie()]);
 
     let movie_id = MovieDetailsHandler::new(
@@ -1055,7 +1055,7 @@ mod tests {
     )]
     movie_details_block: ActiveRadarrBlock,
   ) {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
     let mut modal = MovieDetailsModal {
       movie_details: ScrollableText::with_string("Test".to_owned()),
@@ -1083,7 +1083,7 @@ mod tests {
 
   #[test]
   fn test_movie_details_handler_is_not_ready_when_no_movie_details_are_in_modal() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
 
@@ -1099,7 +1099,7 @@ mod tests {
 
   #[test]
   fn test_movie_details_handler_is_ready_when_movie_details_are_in_modal() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal {
       movie_details: ScrollableText::with_string("Test".to_owned()),
@@ -1118,7 +1118,7 @@ mod tests {
 
   #[test]
   fn test_movie_details_handler_is_ready_when_movie_history_is_in_modal() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     let mut modal = MovieDetailsModal::default();
     modal
@@ -1138,7 +1138,7 @@ mod tests {
 
   #[test]
   fn test_movie_details_handler_is_ready_when_movie_cast_is_in_modal() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     let mut modal = MovieDetailsModal::default();
     modal.movie_cast.set_items(vec![Credit::default()]);
@@ -1156,7 +1156,7 @@ mod tests {
 
   #[test]
   fn test_movie_details_handler_is_ready_when_movie_crew_is_in_modal() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     let mut modal = MovieDetailsModal::default();
     modal.movie_crew.set_items(vec![Credit::default()]);
@@ -1174,7 +1174,7 @@ mod tests {
 
   #[test]
   fn test_movie_details_handler_is_ready_when_movie_releases_is_in_modal() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     let mut modal = MovieDetailsModal::default();
     modal
diff --git a/src/handlers/radarr_handlers/radarr_handler_test_utils.rs b/src/handlers/radarr_handlers/radarr_handler_test_utils.rs
index 6e486f5..eee27ec 100644
--- a/src/handlers/radarr_handlers/radarr_handler_test_utils.rs
+++ b/src/handlers/radarr_handlers/radarr_handler_test_utils.rs
@@ -16,7 +16,7 @@ pub(in crate::handlers::radarr_handlers) mod utils {
   #[macro_export]
   macro_rules! test_edit_movie_key {
     ($handler:ident, $block:expr, $context:expr) => {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut radarr_data = RadarrData {
         quality_profile_map: BiMap::from_iter([
           (2222, "HD - 1080p".to_owned()),
@@ -131,7 +131,7 @@ pub(in crate::handlers::radarr_handlers) mod utils {
   #[macro_export]
   macro_rules! test_edit_collection_key {
     ($handler:ident, $block:expr, $context:expr) => {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut radarr_data = RadarrData {
         quality_profile_map: BiMap::from_iter([
           (2222, "HD - 1080p".to_owned()),
diff --git a/src/handlers/radarr_handlers/radarr_handler_tests.rs b/src/handlers/radarr_handlers/radarr_handler_tests.rs
index b516a4b..cd0dc42 100644
--- a/src/handlers/radarr_handlers/radarr_handler_tests.rs
+++ b/src/handlers/radarr_handlers/radarr_handler_tests.rs
@@ -24,7 +24,7 @@ mod tests {
     #[case] left_block: ActiveRadarrBlock,
     #[case] right_block: ActiveRadarrBlock,
   ) {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.main_tabs.set_index(index);
 
     handle_change_tab_left_right_keys(&mut app, DEFAULT_KEYBINDINGS.left.key);
@@ -219,7 +219,7 @@ mod tests {
 
   #[test]
   fn test_radarr_handler_is_ready() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = RadarrHandler::new(
diff --git a/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs b/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs
index 7b4c0a8..3cf7d98 100644
--- a/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs
+++ b/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs
@@ -22,7 +22,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -81,7 +81,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -98,7 +98,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
       app
@@ -126,7 +126,7 @@ mod tests {
 
     #[rstest]
     fn test_root_folders_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(4);
 
@@ -147,7 +147,7 @@ mod tests {
 
     #[rstest]
     fn test_root_folders_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(4);
 
@@ -170,7 +170,7 @@ mod tests {
     fn test_left_right_delete_root_folder_prompt_toggle(
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       RootFoldersHandler::new(
         key,
@@ -195,7 +195,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_root_folder = Some("Test".into());
 
       RootFoldersHandler::new(
@@ -251,7 +251,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let expected_add_root_folder_body = AddRootFolderBody {
         path: "Test".to_owned(),
       };
@@ -288,7 +288,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_confirm_submit_noop_on_empty_folder() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.edit_root_folder = Some(HorizontallyScrollableText::default());
       app.data.radarr_data.prompt_confirm = false;
       app.should_ignore_quit_key = true;
@@ -314,7 +314,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -345,7 +345,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -380,7 +380,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt_block_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into());
       app.data.radarr_data.prompt_confirm = true;
@@ -402,7 +402,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into());
       app.data.radarr_data.edit_root_folder = Some("/nfs/test".into());
@@ -428,7 +428,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
@@ -453,7 +453,7 @@ mod tests {
 
     #[test]
     fn test_root_folder_add() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -478,7 +478,7 @@ mod tests {
 
     #[test]
     fn test_root_folder_add_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
       app
@@ -505,7 +505,7 @@ mod tests {
 
     #[test]
     fn test_refresh_root_folders_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -530,7 +530,7 @@ mod tests {
 
     #[test]
     fn test_refresh_root_folders_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app
         .data
@@ -556,7 +556,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_backspace_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -580,7 +580,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -604,7 +604,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -646,7 +646,7 @@ mod tests {
 
   #[test]
   fn test_build_add_root_folder_body() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.edit_root_folder = Some("/nfs/test".into());
     let expected_add_root_folder_body = AddRootFolderBody {
       path: "/nfs/test".to_owned(),
@@ -666,7 +666,7 @@ mod tests {
 
   #[test]
   fn test_extract_root_folder_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app
       .data
       .radarr_data
@@ -686,7 +686,7 @@ mod tests {
 
   #[test]
   fn test_root_folders_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = RootFoldersHandler::new(
@@ -701,7 +701,7 @@ mod tests {
 
   #[test]
   fn test_root_folders_handler_not_ready_when_root_folders_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = RootFoldersHandler::new(
@@ -716,7 +716,7 @@ mod tests {
 
   #[test]
   fn test_root_folders_handler_ready_when_not_loading_and_root_folders_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     app
diff --git a/src/handlers/radarr_handlers/system/system_details_handler_tests.rs b/src/handlers/radarr_handlers/system/system_details_handler_tests.rs
index be93db0..7765670 100644
--- a/src/handlers/radarr_handlers/system/system_details_handler_tests.rs
+++ b/src/handlers/radarr_handlers/system/system_details_handler_tests.rs
@@ -39,7 +39,7 @@ mod tests {
     fn test_log_details_scroll_no_op_when_not_ready(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app
         .data
@@ -70,7 +70,7 @@ mod tests {
     fn test_tasks_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
       app
         .data
@@ -97,7 +97,7 @@ mod tests {
     fn test_tasks_scroll_no_op_when_not_ready(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
       app
@@ -125,7 +125,7 @@ mod tests {
     fn test_queued_events_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
       app
         .data
@@ -154,7 +154,7 @@ mod tests {
     fn test_queued_events_scroll_no_op_when_not_ready(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
       app
@@ -182,7 +182,7 @@ mod tests {
 
     #[test]
     fn test_system_updates_scroll() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
 
       SystemDetailsHandler::new(
@@ -208,7 +208,7 @@ mod tests {
 
     #[test]
     fn test_system_updates_scroll_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
 
@@ -254,7 +254,7 @@ mod tests {
 
     #[test]
     fn test_log_details_home_end_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app
         .data
@@ -295,7 +295,7 @@ mod tests {
 
     #[test]
     fn test_tasks_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates =
         ScrollableText::with_string("Test 1\nTest 2\nTest 3".to_owned());
       app
@@ -333,7 +333,7 @@ mod tests {
 
     #[test]
     fn test_tasks_home_end_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.updates =
         ScrollableText::with_string("Test 1\nTest 2\nTest 3".to_owned());
@@ -372,7 +372,7 @@ mod tests {
 
     #[test]
     fn test_queued_events_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates =
         ScrollableText::with_string("Test 1\nTest 2\nTest 3".to_owned());
       app
@@ -410,7 +410,7 @@ mod tests {
 
     #[test]
     fn test_queued_events_home_end_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.updates =
         ScrollableText::with_string("Test 1\nTest 2\nTest 3".to_owned());
@@ -449,7 +449,7 @@ mod tests {
 
     #[test]
     fn test_system_updates_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
 
       SystemDetailsHandler::new(
@@ -475,7 +475,7 @@ mod tests {
 
     #[test]
     fn test_system_updates_home_end_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
 
@@ -510,7 +510,7 @@ mod tests {
     #[test]
     fn test_handle_log_details_left_right() {
       let active_radarr_block = ActiveRadarrBlock::SystemLogs;
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -610,7 +610,7 @@ mod tests {
     fn test_left_right_prompt_toggle(
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
 
       SystemDetailsHandler::new(
         key,
@@ -645,7 +645,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
 
       SystemDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SystemTasks, None)
@@ -659,7 +659,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into());
       app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
@@ -675,7 +675,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_start_task_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
       app.data.radarr_data.prompt_confirm = true;
       app.data.radarr_data.tasks.set_items(vec![RadarrTask {
@@ -706,7 +706,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_start_task_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
       app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into());
       app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into());
@@ -739,7 +739,7 @@ mod tests {
 
     #[rstest]
     fn test_esc_system_logs(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app
         .data
@@ -762,7 +762,7 @@ mod tests {
 
     #[rstest]
     fn test_esc_system_tasks(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveRadarrBlock::System.into());
       app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into());
@@ -779,7 +779,7 @@ mod tests {
 
     #[rstest]
     fn test_esc_system_queued_events(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveRadarrBlock::System.into());
       app.push_navigation_stack(ActiveRadarrBlock::SystemQueuedEvents.into());
@@ -802,7 +802,7 @@ mod tests {
 
     #[rstest]
     fn test_esc_system_updates(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveRadarrBlock::System.into());
       app.push_navigation_stack(ActiveRadarrBlock::SystemUpdates.into());
@@ -814,7 +814,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_start_task_prompt_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into());
       app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into());
       app.data.radarr_data.prompt_confirm = true;
@@ -853,7 +853,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
       app.push_navigation_stack(active_radarr_block.into());
 
@@ -879,7 +879,7 @@ mod tests {
       )]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
       app.push_navigation_stack(active_radarr_block.into());
@@ -898,7 +898,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_start_task_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
       app.data.radarr_data.tasks.set_items(vec![RadarrTask {
         task_name: RadarrTaskName::default(),
@@ -940,7 +940,7 @@ mod tests {
 
   #[test]
   fn test_extract_task_name() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.radarr_data.tasks.set_items(vec![RadarrTask {
       task_name: RadarrTaskName::default(),
       ..RadarrTask::default()
@@ -959,7 +959,7 @@ mod tests {
 
   #[test]
   fn test_system_details_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = SystemDetailsHandler::new(
@@ -974,7 +974,7 @@ mod tests {
 
   #[test]
   fn test_system_details_handler_not_ready_when_log_details_and_updates_and_tasks_are_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = SystemDetailsHandler::new(
@@ -989,7 +989,7 @@ mod tests {
 
   #[test]
   fn test_system_details_handler_ready_when_not_loading_and_log_details_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app
       .data
@@ -1009,7 +1009,7 @@ mod tests {
 
   #[test]
   fn test_system_details_handler_ready_when_not_loading_and_tasks_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app
       .data
@@ -1029,7 +1029,7 @@ mod tests {
 
   #[test]
   fn test_system_details_handler_ready_when_not_loading_and_updates_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
 
diff --git a/src/handlers/radarr_handlers/system/system_handler_tests.rs b/src/handlers/radarr_handlers/system/system_handler_tests.rs
index 3cae944..3a5be26 100644
--- a/src/handlers/radarr_handlers/system/system_handler_tests.rs
+++ b/src/handlers/radarr_handlers/system/system_handler_tests.rs
@@ -22,7 +22,7 @@ mod tests {
 
     #[rstest]
     fn test_system_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(6);
 
@@ -43,7 +43,7 @@ mod tests {
 
     #[rstest]
     fn test_system_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.radarr_data.main_tabs.set_index(6);
 
@@ -72,7 +72,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_loading: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_loading;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveRadarrBlock::System.into());
@@ -94,7 +94,7 @@ mod tests {
 
     #[test]
     fn test_update_system_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.logs.set_items(vec![
         HorizontallyScrollableText::from("test 1"),
         HorizontallyScrollableText::from("test 2"),
@@ -126,7 +126,7 @@ mod tests {
 
     #[test]
     fn test_update_system_key_no_op_if_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::System.into());
       app.data.radarr_data.logs.set_items(vec![
@@ -157,7 +157,7 @@ mod tests {
 
     #[test]
     fn test_queued_events_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.logs.set_items(vec![
         HorizontallyScrollableText::from("test 1"),
         HorizontallyScrollableText::from("test 2"),
@@ -189,7 +189,7 @@ mod tests {
 
     #[test]
     fn test_queued_events_key_no_op_if_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::System.into());
       app.data.radarr_data.logs.set_items(vec![
@@ -220,7 +220,7 @@ mod tests {
 
     #[test]
     fn test_refresh_system_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.logs.set_items(vec![
         HorizontallyScrollableText::from("test 1"),
         HorizontallyScrollableText::from("test 2"),
@@ -251,7 +251,7 @@ mod tests {
 
     #[test]
     fn test_refresh_system_key_no_op_if_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::System.into());
       app.data.radarr_data.logs.set_items(vec![
@@ -284,7 +284,7 @@ mod tests {
 
     #[test]
     fn test_logs_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.logs.set_items(vec![
         HorizontallyScrollableText::from("test 1"),
         HorizontallyScrollableText::from("test 2"),
@@ -324,7 +324,7 @@ mod tests {
 
     #[test]
     fn test_logs_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::System.into());
       app.data.radarr_data.logs.set_items(vec![
@@ -356,7 +356,7 @@ mod tests {
 
     #[test]
     fn test_tasks_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.logs.set_items(vec![
         HorizontallyScrollableText::from("test 1"),
         HorizontallyScrollableText::from("test 2"),
@@ -388,7 +388,7 @@ mod tests {
 
     #[test]
     fn test_tasks_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::System.into());
       app.data.radarr_data.logs.set_items(vec![
@@ -452,7 +452,7 @@ mod tests {
 
   #[test]
   fn test_system_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let system_handler = SystemHandler::new(
@@ -467,7 +467,7 @@ mod tests {
 
   #[test]
   fn test_system_handler_is_not_ready_when_logs_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app
       .data
@@ -492,7 +492,7 @@ mod tests {
 
   #[test]
   fn test_system_handler_is_not_ready_when_tasks_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app.data.radarr_data.logs.set_items(vec!["test".into()]);
     app
@@ -513,7 +513,7 @@ mod tests {
 
   #[test]
   fn test_system_handler_is_not_ready_when_queued_events_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app.data.radarr_data.logs.set_items(vec!["test".into()]);
     app
@@ -534,7 +534,7 @@ mod tests {
 
   #[test]
   fn test_system_handler_is_ready_when_all_required_tables_are_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app.data.radarr_data.logs.set_items(vec!["test".into()]);
     app
diff --git a/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs b/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs
index 0d1fbab..da345db 100644
--- a/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs
@@ -24,7 +24,7 @@ mod tests {
 
     #[test]
     fn test_delete_blocklist_item_prompt() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
 
@@ -38,7 +38,7 @@ mod tests {
 
     #[test]
     fn test_delete_blocklist_item_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
@@ -57,7 +57,7 @@ mod tests {
 
     #[rstest]
     fn test_blocklist_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(2);
@@ -79,7 +79,7 @@ mod tests {
 
     #[rstest]
     fn test_blocklist_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(2);
@@ -108,7 +108,7 @@ mod tests {
       active_sonarr_block: ActiveSonarrBlock,
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
 
       BlocklistHandler::new(key, &mut app, active_sonarr_block, None).handle();
@@ -133,7 +133,7 @@ mod tests {
 
     #[test]
     fn test_blocklist_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
 
@@ -147,7 +147,7 @@ mod tests {
 
     #[test]
     fn test_blocklist_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
@@ -173,7 +173,7 @@ mod tests {
       #[case] prompt_block: ActiveSonarrBlock,
       #[case] expected_action: SonarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
       app.data.sonarr_data.prompt_confirm = true;
       app.push_navigation_stack(base_route.into());
@@ -197,7 +197,7 @@ mod tests {
       )]
       prompt_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
       app.push_navigation_stack(prompt_block.into());
@@ -231,7 +231,7 @@ mod tests {
       #[case] base_block: ActiveSonarrBlock,
       #[case] prompt_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(base_block.into());
       app.push_navigation_stack(prompt_block.into());
       app.data.sonarr_data.prompt_confirm = true;
@@ -244,7 +244,7 @@ mod tests {
 
     #[test]
     fn test_esc_blocklist_item_details() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
       app.push_navigation_stack(ActiveSonarrBlock::BlocklistItemDetails.into());
 
@@ -261,7 +261,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
@@ -284,7 +284,7 @@ mod tests {
 
     #[test]
     fn test_refresh_blocklist_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
 
@@ -302,7 +302,7 @@ mod tests {
 
     #[test]
     fn test_refresh_blocklist_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
@@ -321,7 +321,7 @@ mod tests {
 
     #[test]
     fn test_clear_blocklist_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
 
@@ -341,7 +341,7 @@ mod tests {
 
     #[test]
     fn test_clear_blocklist_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
@@ -373,7 +373,7 @@ mod tests {
       #[case] prompt_block: ActiveSonarrBlock,
       #[case] expected_action: SonarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.blocklist.set_items(blocklist_vec());
       app.push_navigation_stack(base_route.into());
       app.push_navigation_stack(prompt_block.into());
@@ -515,7 +515,7 @@ mod tests {
 
   #[test]
   fn test_extract_blocklist_item_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.blocklist.set_items(blocklist_vec());
 
     let blocklist_item_id = BlocklistHandler::new(
@@ -531,7 +531,7 @@ mod tests {
 
   #[test]
   fn test_blocklist_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
     app.is_loading = true;
 
@@ -547,7 +547,7 @@ mod tests {
 
   #[test]
   fn test_blocklist_handler_not_ready_when_blocklist_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
     app.is_loading = false;
 
@@ -563,7 +563,7 @@ mod tests {
 
   #[test]
   fn test_blocklist_handler_ready_when_not_loading_and_blocklist_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
     app.is_loading = false;
     app
diff --git a/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs b/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs
index ca10805..06331bf 100644
--- a/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs
@@ -21,7 +21,7 @@ mod tests {
 
     #[test]
     fn test_delete_download_prompt() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
       app
         .data
@@ -39,7 +39,7 @@ mod tests {
 
     #[test]
     fn test_delete_download_prompt_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
       app
@@ -62,7 +62,7 @@ mod tests {
 
     #[rstest]
     fn test_downloads_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(1);
@@ -84,7 +84,7 @@ mod tests {
 
     #[rstest]
     fn test_downloads_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(1);
@@ -113,7 +113,7 @@ mod tests {
       active_sonarr_block: ActiveSonarrBlock,
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
 
       DownloadsHandler::new(key, &mut app, active_sonarr_block, None).handle();
@@ -152,7 +152,7 @@ mod tests {
       #[case] prompt_block: ActiveSonarrBlock,
       #[case] expected_action: SonarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -179,7 +179,7 @@ mod tests {
       #[case] base_route: ActiveSonarrBlock,
       #[case] prompt_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -211,7 +211,7 @@ mod tests {
       #[case] base_block: ActiveSonarrBlock,
       #[case] prompt_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(base_block.into());
       app.push_navigation_stack(prompt_block.into());
       app.data.sonarr_data.prompt_confirm = true;
@@ -224,7 +224,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
@@ -247,7 +247,7 @@ mod tests {
 
     #[test]
     fn test_update_downloads_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
       app
         .data
@@ -271,7 +271,7 @@ mod tests {
 
     #[test]
     fn test_update_downloads_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
       app
@@ -293,7 +293,7 @@ mod tests {
 
     #[test]
     fn test_refresh_downloads_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -315,7 +315,7 @@ mod tests {
 
     #[test]
     fn test_refresh_downloads_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
       app
@@ -352,7 +352,7 @@ mod tests {
       #[case] prompt_block: ActiveSonarrBlock,
       #[case] expected_action: SonarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -391,7 +391,7 @@ mod tests {
 
   #[test]
   fn test_extract_download_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app
       .data
       .sonarr_data
@@ -411,7 +411,7 @@ mod tests {
 
   #[test]
   fn test_downloads_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
     app.is_loading = true;
 
@@ -427,7 +427,7 @@ mod tests {
 
   #[test]
   fn test_downloads_handler_not_ready_when_downloads_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
     app.is_loading = false;
 
@@ -443,7 +443,7 @@ mod tests {
 
   #[test]
   fn test_downloads_handler_ready_when_not_loading_and_downloads_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
     app.is_loading = false;
 
diff --git a/src/handlers/sonarr_handlers/history/history_handler_tests.rs b/src/handlers/sonarr_handlers/history/history_handler_tests.rs
index ab41c95..3eff736 100644
--- a/src/handlers/sonarr_handlers/history/history_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/history/history_handler_tests.rs
@@ -23,7 +23,7 @@ mod tests {
 
     #[rstest]
     fn test_history_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::History.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(3);
@@ -45,7 +45,7 @@ mod tests {
 
     #[rstest]
     fn test_history_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::History.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(3);
@@ -78,7 +78,7 @@ mod tests {
 
     #[test]
     fn test_history_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.history.set_items(history_vec());
       app.push_navigation_stack(ActiveSonarrBlock::History.into());
 
@@ -92,7 +92,7 @@ mod tests {
 
     #[test]
     fn test_history_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.sonarr_data.history.set_items(history_vec());
       app.push_navigation_stack(ActiveSonarrBlock::History.into());
@@ -115,7 +115,7 @@ mod tests {
 
     #[test]
     fn test_esc_history_item_details() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -137,7 +137,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveSonarrBlock::History.into());
@@ -163,7 +163,7 @@ mod tests {
 
     #[test]
     fn test_refresh_history_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.history.set_items(history_vec());
       app.push_navigation_stack(ActiveSonarrBlock::History.into());
 
@@ -181,7 +181,7 @@ mod tests {
 
     #[test]
     fn test_refresh_history_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.sonarr_data.history.set_items(history_vec());
       app.push_navigation_stack(ActiveSonarrBlock::History.into());
@@ -308,7 +308,7 @@ mod tests {
 
   #[test]
   fn test_history_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::History.into());
     app.is_loading = true;
 
@@ -324,7 +324,7 @@ mod tests {
 
   #[test]
   fn test_history_handler_not_ready_when_history_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::History.into());
     app.is_loading = false;
 
@@ -340,7 +340,7 @@ mod tests {
 
   #[test]
   fn test_history_handler_ready_when_not_loading_and_history_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::History.into());
     app.is_loading = false;
     app
diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs
index a4f922a..22719ff 100644
--- a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs
@@ -25,7 +25,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_priority_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -101,7 +101,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.data.sonarr_data.selected_block =
@@ -127,7 +127,7 @@ mod tests {
     fn test_edit_indexer_prompt_scroll_no_op_when_not_ready(
       #[values(Key::Up, Key::Down)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.is_loading = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
@@ -155,7 +155,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_name_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         name: "Test".into(),
@@ -207,7 +207,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_url_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         url: "Test".into(),
@@ -259,7 +259,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_api_key_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         api_key: "Test".into(),
@@ -311,7 +311,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_seed_ratio_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         seed_ratio: "Test".into(),
@@ -363,7 +363,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_tags_input_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         tags: "Test".into(),
@@ -430,7 +430,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.selected_block =
         BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
@@ -472,7 +472,7 @@ mod tests {
       #[case] left_block: ActiveSonarrBlock,
       #[case] right_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.selected_block =
         BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
@@ -525,7 +525,7 @@ mod tests {
       #[case] left_block: ActiveSonarrBlock,
       #[case] right_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.selected_block =
         BlockSelectionState::new(EDIT_INDEXER_NZB_SELECTION_BLOCKS);
@@ -555,7 +555,7 @@ mod tests {
     fn test_left_right_block_toggle_torren_empty_row_to_prompt_confirm(
       #[values(Key::Left, Key::Right)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.selected_block =
         BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
@@ -585,7 +585,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_name_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         name: "Test".into(),
@@ -637,7 +637,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_url_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         url: "Test".into(),
@@ -689,7 +689,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_api_key_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         api_key: "Test".into(),
@@ -741,7 +741,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_seed_ratio_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         seed_ratio: "Test".into(),
@@ -793,7 +793,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_tags_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         tags: "Test".into(),
@@ -861,7 +861,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into());
       app.data.sonarr_data.selected_block =
@@ -889,7 +889,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_prompt_prompt_confirmation_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into());
       app.data.sonarr_data.selected_block =
@@ -946,7 +946,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_prompt_prompt_confirmation_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into());
@@ -981,7 +981,7 @@ mod tests {
       #[case] starting_x: usize,
       #[case] block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into());
@@ -1007,7 +1007,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_priority_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into());
@@ -1032,7 +1032,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_toggle_enable_rss_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.data.sonarr_data.selected_block =
@@ -1085,7 +1085,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_toggle_enable_automatic_search_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.data.sonarr_data.selected_block =
@@ -1138,7 +1138,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_toggle_enable_interactive_search_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
       app.data.sonarr_data.selected_block =
@@ -1191,7 +1191,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_name_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.should_ignore_quit_key = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
@@ -1227,7 +1227,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_url_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.should_ignore_quit_key = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
@@ -1263,7 +1263,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_api_key_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.should_ignore_quit_key = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
@@ -1299,7 +1299,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_seed_ratio_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.should_ignore_quit_key = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
@@ -1335,7 +1335,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_tags_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.should_ignore_quit_key = true;
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
@@ -1382,7 +1382,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_prompt_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into());
@@ -1413,7 +1413,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(active_sonarr_block.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
@@ -1442,7 +1442,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_name_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         name: "Test".into(),
@@ -1472,7 +1472,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_url_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         url: "Test".into(),
@@ -1502,7 +1502,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_api_key_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         api_key: "Test".into(),
@@ -1532,7 +1532,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_seed_ratio_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         seed_ratio: "Test".into(),
@@ -1562,7 +1562,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_tags_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal {
         tags: "Test".into(),
@@ -1592,7 +1592,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_name_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -1619,7 +1619,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_url_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -1646,7 +1646,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_api_key_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -1673,7 +1673,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_seed_ratio_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -1700,7 +1700,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_tags_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
 
@@ -1727,7 +1727,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_prompt_prompt_confirmation_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into());
       app.data.sonarr_data.selected_block =
@@ -1795,7 +1795,7 @@ mod tests {
 
   #[test]
   fn test_build_edit_indexer_params() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let edit_indexer_modal = EditIndexerModal {
       name: "Test Update".into(),
       enable_rss: Some(false),
@@ -1837,7 +1837,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = true;
 
@@ -1853,7 +1853,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_handler_is_not_ready_when_edit_indexer_modal_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = false;
 
@@ -1869,7 +1869,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_handler_is_ready_when_edit_indexer_modal_is_some() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = false;
     app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
index 62319f4..23446d8 100644
--- a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
@@ -26,7 +26,7 @@ mod tests {
 
     macro_rules! test_i64_counter_scroll_value {
       ($block:expr, $key:expr, $data_ref:ident, $negatives:literal) => {
-        let mut app = App::default();
+        let mut app = App::test_default();
         app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
         app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default());
 
@@ -98,7 +98,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_settings_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default());
       app.data.sonarr_data.selected_block =
@@ -130,7 +130,7 @@ mod tests {
     fn test_edit_indexer_settings_prompt_scroll_no_op_when_not_ready(
       #[values(Key::Up, Key::Down)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.is_loading = true;
       app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default());
@@ -203,7 +203,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.selected_block =
         BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS);
@@ -249,7 +249,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::AllIndexerSettingsPrompt.into());
       app.data.sonarr_data.selected_block =
@@ -277,7 +277,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_prompt_prompt_confirmation_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::AllIndexerSettingsPrompt.into());
       app.data.sonarr_data.selected_block =
@@ -309,7 +309,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_prompt_prompt_confirmation_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::AllIndexerSettingsPrompt.into());
@@ -340,7 +340,7 @@ mod tests {
       #[case] selected_block: ActiveSonarrBlock,
       #[case] y_index: usize,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default());
       app.push_navigation_stack(ActiveSonarrBlock::AllIndexerSettingsPrompt.into());
@@ -363,7 +363,7 @@ mod tests {
     fn test_edit_indexer_settings_prompt_submit_selected_block_no_op_when_not_ready(
       #[values(0, 1, 2, 3, 4)] y_index: usize,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.is_loading = true;
       app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default());
@@ -396,7 +396,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default());
       app.push_navigation_stack(ActiveSonarrBlock::AllIndexerSettingsPrompt.into());
@@ -423,7 +423,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_settings_prompt_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::AllIndexerSettingsPrompt.into());
@@ -452,7 +452,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(active_sonarr_block.into());
       app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default());
@@ -480,7 +480,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_settings_prompt_prompt_confirmation_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::AllIndexerSettingsPrompt.into());
       app.data.sonarr_data.selected_block =
@@ -523,7 +523,7 @@ mod tests {
 
   #[test]
   fn test_build_edit_indexer_settings_params() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.indexer_settings = Some(indexer_settings());
 
     let actual_indexer_settings = IndexerSettingsHandler::new(
@@ -540,7 +540,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_settings_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = true;
 
@@ -556,7 +556,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_settings_handler_not_ready_when_indexer_settings_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = false;
 
@@ -572,7 +572,7 @@ mod tests {
 
   #[test]
   fn test_edit_indexer_settings_handler_ready_when_not_loading_and_indexer_settings_is_some() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = false;
     app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default());
diff --git a/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs
index 10f0ee6..b059315 100644
--- a/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs
@@ -25,7 +25,7 @@ mod tests {
 
     #[test]
     fn test_delete_indexer_prompt() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app
         .data
@@ -43,7 +43,7 @@ mod tests {
 
     #[test]
     fn test_delete_indexer_prompt_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app
@@ -66,7 +66,7 @@ mod tests {
 
     #[rstest]
     fn test_indexers_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(5);
@@ -91,7 +91,7 @@ mod tests {
 
     #[rstest]
     fn test_indexers_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(5);
@@ -115,7 +115,7 @@ mod tests {
     fn test_left_right_delete_indexer_prompt_toggle(
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
 
       IndexersHandler::new(key, &mut app, ActiveSonarrBlock::DeleteIndexerPrompt, None).handle();
@@ -146,7 +146,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_indexer_submit(#[values(true, false)] torrent_protocol: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       let protocol = if torrent_protocol {
         "torrent".to_owned()
@@ -228,7 +228,7 @@ mod tests {
 
     #[test]
     fn test_edit_indexer_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
@@ -246,7 +246,7 @@ mod tests {
 
     #[test]
     fn test_delete_indexer_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.indexers.set_items(vec![indexer()]);
       app.data.sonarr_data.prompt_confirm = true;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
@@ -270,7 +270,7 @@ mod tests {
 
     #[test]
     fn test_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -302,7 +302,7 @@ mod tests {
 
     #[rstest]
     fn test_delete_indexer_prompt_block_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::DeleteIndexerPrompt.into());
@@ -322,7 +322,7 @@ mod tests {
 
     #[rstest]
     fn test_test_indexer_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.sonarr_data.indexer_test_errors = Some("test result".to_owned());
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
@@ -336,7 +336,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
@@ -361,7 +361,7 @@ mod tests {
 
     #[test]
     fn test_refresh_indexers_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -383,7 +383,7 @@ mod tests {
 
     #[test]
     fn test_refresh_indexers_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app
         .data
@@ -406,7 +406,7 @@ mod tests {
 
     #[test]
     fn test_indexer_settings_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -439,7 +439,7 @@ mod tests {
 
     #[test]
     fn test_indexer_settings_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app
@@ -461,7 +461,7 @@ mod tests {
 
     #[test]
     fn test_test_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app
         .data
@@ -485,7 +485,7 @@ mod tests {
 
     #[test]
     fn test_test_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app
@@ -507,7 +507,7 @@ mod tests {
 
     #[test]
     fn test_test_all_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app
         .data
@@ -531,7 +531,7 @@ mod tests {
 
     #[test]
     fn test_test_all_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app
@@ -553,7 +553,7 @@ mod tests {
 
     #[test]
     fn test_delete_indexer_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.indexers.set_items(vec![indexer()]);
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::DeleteIndexerPrompt.into());
@@ -645,7 +645,7 @@ mod tests {
 
   #[test]
   fn test_extract_indexer_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.indexers.set_items(vec![indexer()]);
 
     let indexer_id = IndexersHandler::new(
@@ -661,7 +661,7 @@ mod tests {
 
   #[test]
   fn test_indexers_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = true;
 
@@ -677,7 +677,7 @@ mod tests {
 
   #[test]
   fn test_indexers_handler_not_ready_when_indexers_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = false;
 
@@ -693,7 +693,7 @@ mod tests {
 
   #[test]
   fn test_indexers_handler_ready_when_not_loading_and_indexers_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = false;
     app
diff --git a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs
index c86c18d..b52d39d 100644
--- a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs
@@ -17,7 +17,7 @@ mod tests {
 
     #[rstest]
     fn test_test_all_indexers_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
       app.push_navigation_stack(ActiveSonarrBlock::TestAllIndexers.into());
@@ -50,7 +50,7 @@ mod tests {
 
   #[test]
   fn test_test_all_indexers_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = true;
 
@@ -66,7 +66,7 @@ mod tests {
 
   #[test]
   fn test_test_all_indexers_handler_is_not_ready_when_results_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = false;
 
@@ -82,7 +82,7 @@ mod tests {
 
   #[test]
   fn test_test_all_indexers_handler_is_not_ready_when_results_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = false;
     app.data.sonarr_data.indexer_test_all_results = Some(StatefulTable::default());
@@ -99,7 +99,7 @@ mod tests {
 
   #[test]
   fn test_test_all_indexers_handler_is_ready_when_results_is_not_empty_and_is_loaded() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
     app.is_loading = false;
     let mut indexer_test_results = StatefulTable::default();
diff --git a/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs b/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
index e6d078b..4919e5c 100644
--- a/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
@@ -36,7 +36,7 @@ mod tests {
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
       let monitor_vec = Vec::from_iter(SeriesMonitor::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app
@@ -100,7 +100,7 @@ mod tests {
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
       let series_type_vec = Vec::from_iter(SeriesType::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app
@@ -163,7 +163,7 @@ mod tests {
     fn test_add_series_select_quality_profile_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app
@@ -220,7 +220,7 @@ mod tests {
     fn test_add_series_select_language_profile_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app
@@ -277,7 +277,7 @@ mod tests {
     fn test_add_series_select_root_folder_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app
@@ -334,7 +334,7 @@ mod tests {
 
     #[rstest]
     fn test_add_series_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.selected_block = BlockSelectionState::new(ADD_SERIES_SELECTION_BLOCKS);
       app.data.sonarr_data.selected_block.down();
@@ -356,7 +356,7 @@ mod tests {
 
     #[rstest]
     fn test_add_series_prompt_scroll_no_op_when_not_ready(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.is_loading = true;
       app.data.sonarr_data.selected_block = BlockSelectionState::new(ADD_SERIES_SELECTION_BLOCKS);
@@ -385,7 +385,7 @@ mod tests {
     #[test]
     fn test_add_series_select_monitor_home_end() {
       let monitor_vec = Vec::from_iter(SeriesMonitor::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app
@@ -441,7 +441,7 @@ mod tests {
     #[test]
     fn test_add_series_select_series_type_home_end() {
       let series_type_vec = Vec::from_iter(SeriesType::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app
@@ -496,7 +496,7 @@ mod tests {
 
     #[test]
     fn test_add_series_select_quality_profile_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app
@@ -555,7 +555,7 @@ mod tests {
 
     #[test]
     fn test_add_series_select_language_profile_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app
@@ -614,7 +614,7 @@ mod tests {
 
     #[test]
     fn test_add_series_select_root_folder_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app
@@ -671,7 +671,7 @@ mod tests {
 
     #[test]
     fn test_add_series_search_input_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_search = Some("Test".into());
 
@@ -718,7 +718,7 @@ mod tests {
 
     #[test]
     fn test_add_series_tags_input_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal {
         tags: "Test".into(),
@@ -780,7 +780,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
 
       AddSeriesHandler::new(key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle();
@@ -794,7 +794,7 @@ mod tests {
 
     #[test]
     fn test_add_series_search_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_search = Some("Test".into());
 
@@ -841,7 +841,7 @@ mod tests {
 
     #[test]
     fn test_add_series_tags_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal {
         tags: "Test".into(),
@@ -910,7 +910,7 @@ mod tests {
 
     #[test]
     fn test_add_series_search_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.should_ignore_quit_key = true;
       app.data.sonarr_data.add_series_search = Some("test".into());
@@ -932,7 +932,7 @@ mod tests {
 
     #[test]
     fn test_add_series_search_input_submit_noop_on_empty_search() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.add_series_search = Some(HorizontallyScrollableText::default());
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchInput.into());
@@ -955,7 +955,7 @@ mod tests {
 
     #[test]
     fn test_add_series_search_results_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       let mut add_searched_series = StatefulTable::default();
       add_searched_series.set_items(vec![AddSeriesSearchResult::default()]);
@@ -1022,7 +1022,7 @@ mod tests {
 
     #[test]
     fn test_add_series_search_results_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchResults.into());
@@ -1046,7 +1046,7 @@ mod tests {
 
     #[test]
     fn test_add_series_search_results_submit_does_nothing_on_empty_table() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchResults.into());
       AddSeriesHandler::new(
@@ -1065,7 +1065,7 @@ mod tests {
 
     #[test]
     fn test_add_series_search_results_submit_series_already_in_library() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       let mut add_searched_series = StatefulTable::default();
       add_searched_series.set_items(vec![AddSeriesSearchResult::default()]);
@@ -1092,7 +1092,7 @@ mod tests {
 
     #[test]
     fn test_add_series_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into());
       app.data.sonarr_data.selected_block = BlockSelectionState::new(ADD_SERIES_SELECTION_BLOCKS);
@@ -1116,7 +1116,7 @@ mod tests {
 
     #[test]
     fn test_add_series_confirm_prompt_prompt_confirmation_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into());
       app.data.sonarr_data.prompt_confirm = true;
@@ -1212,7 +1212,7 @@ mod tests {
       #[case] selected_block: ActiveSonarrBlock,
       #[case] y_index: usize,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into());
       app.data.sonarr_data.selected_block = BlockSelectionState::new(ADD_SERIES_SELECTION_BLOCKS);
@@ -1246,7 +1246,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into());
       app.push_navigation_stack(active_sonarr_block.into());
@@ -1265,7 +1265,7 @@ mod tests {
 
     #[test]
     fn test_add_series_toggle_use_season_folder_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app.data.sonarr_data.selected_block = BlockSelectionState::new(ADD_SERIES_SELECTION_BLOCKS);
       app.data.sonarr_data.selected_block.set_index(0, 5);
@@ -1333,7 +1333,7 @@ mod tests {
 
     #[rstest]
     fn test_add_series_search_input_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.sonarr_data = create_test_sonarr_data();
       app.should_ignore_quit_key = true;
@@ -1355,7 +1355,7 @@ mod tests {
 
     #[test]
     fn test_add_series_input_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
@@ -1385,7 +1385,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchInput.into());
       app.push_navigation_stack(active_sonarr_block.into());
@@ -1408,7 +1408,7 @@ mod tests {
 
     #[test]
     fn test_add_series_already_in_library_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchResults.into());
@@ -1430,7 +1430,7 @@ mod tests {
 
     #[test]
     fn test_add_series_prompt_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
@@ -1449,7 +1449,7 @@ mod tests {
 
     #[test]
     fn test_add_series_tags_input_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
@@ -1482,7 +1482,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into());
       app.push_navigation_stack(active_sonarr_block.into());
@@ -1509,7 +1509,7 @@ mod tests {
 
     #[test]
     fn test_add_series_search_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_search = Some("Test".into());
 
@@ -1535,7 +1535,7 @@ mod tests {
 
     #[test]
     fn test_add_series_tags_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal {
         tags: "Test".into(),
@@ -1565,7 +1565,7 @@ mod tests {
 
     #[test]
     fn test_add_series_search_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_search = Some(HorizontallyScrollableText::default());
 
@@ -1591,7 +1591,7 @@ mod tests {
 
     #[test]
     fn test_add_series_tags_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default());
 
@@ -1618,7 +1618,7 @@ mod tests {
 
     #[test]
     fn test_add_series_confirm_prompt_prompt_confirmation_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut add_series_modal = AddSeriesModal {
         use_season_folder: true,
         tags: "usenet, testing".into(),
@@ -1716,7 +1716,7 @@ mod tests {
 
   #[test]
   fn test_add_series_search_no_panic_on_none_search_result() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.add_series_search = None;
 
     AddSeriesHandler::new(
@@ -1730,7 +1730,7 @@ mod tests {
 
   #[test]
   fn test_build_add_series_body() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let mut add_series_modal = AddSeriesModal {
       use_season_folder: true,
       tags: "usenet, testing".into(),
@@ -1803,7 +1803,7 @@ mod tests {
 
   #[test]
   fn test_add_series_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Series.into());
     app.is_loading = true;
 
@@ -1819,7 +1819,7 @@ mod tests {
 
   #[test]
   fn test_add_series_handler_is_ready_when_not_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Series.into());
     app.is_loading = false;
 
diff --git a/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs b/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs
index 30c3491..cecdcbe 100644
--- a/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs
@@ -23,7 +23,7 @@ mod tests {
 
     #[rstest]
     fn test_delete_series_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.selected_block =
         BlockSelectionState::new(DELETE_SERIES_SELECTION_BLOCKS);
       app.data.sonarr_data.selected_block.down();
@@ -47,7 +47,7 @@ mod tests {
     fn test_delete_series_prompt_scroll_no_op_when_not_ready(
       #[values(Key::Up, Key::Down)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.sonarr_data.selected_block =
         BlockSelectionState::new(DELETE_SERIES_SELECTION_BLOCKS);
@@ -69,7 +69,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::DeleteSeriesPrompt.into());
 
       DeleteSeriesHandler::new(key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, None).handle();
@@ -95,7 +95,7 @@ mod tests {
 
     #[test]
     fn test_delete_series_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::DeleteSeriesPrompt.into());
       app.data.sonarr_data.selected_block =
@@ -125,7 +125,7 @@ mod tests {
 
     #[test]
     fn test_delete_series_confirm_prompt_prompt_confirmation_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::DeleteSeriesPrompt.into());
       app.data.sonarr_data.prompt_confirm = true;
@@ -166,7 +166,7 @@ mod tests {
 
     #[test]
     fn test_delete_series_confirm_prompt_prompt_confirmation_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::DeleteSeriesPrompt.into());
@@ -196,7 +196,7 @@ mod tests {
     #[test]
     fn test_delete_series_toggle_delete_files_submit() {
       let current_route = ActiveSonarrBlock::DeleteSeriesPrompt.into();
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.selected_block =
         BlockSelectionState::new(DELETE_SERIES_SELECTION_BLOCKS);
       app.push_navigation_stack(ActiveSonarrBlock::DeleteSeriesPrompt.into());
@@ -234,7 +234,7 @@ mod tests {
 
     #[rstest]
     fn test_delete_series_prompt_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::DeleteSeriesPrompt.into());
@@ -270,7 +270,7 @@ mod tests {
 
     #[test]
     fn test_delete_series_confirm_prompt_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::DeleteSeriesPrompt.into());
       app.data.sonarr_data.delete_series_files = true;
@@ -322,7 +322,7 @@ mod tests {
 
   #[test]
   fn test_build_delete_series_params() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.series.set_items(vec![series()]);
     app.data.sonarr_data.delete_series_files = true;
     app.data.sonarr_data.add_list_exclusion = true;
@@ -347,7 +347,7 @@ mod tests {
 
   #[test]
   fn test_delete_series_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = DeleteSeriesHandler::new(
@@ -362,7 +362,7 @@ mod tests {
 
   #[test]
   fn test_delete_series_handler_ready_when_not_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = DeleteSeriesHandler::new(
diff --git a/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs b/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs
index abb3242..6633c55 100644
--- a/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs
@@ -30,7 +30,7 @@ mod tests {
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
       let series_type_vec = Vec::from_iter(SeriesType::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app
@@ -93,7 +93,7 @@ mod tests {
     fn test_edit_series_select_quality_profile_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app
@@ -150,7 +150,7 @@ mod tests {
     fn test_edit_series_select_language_profile_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app
@@ -205,7 +205,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_series_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app.data.sonarr_data.selected_block = BlockSelectionState::new(EDIT_SERIES_SELECTION_BLOCKS);
@@ -228,7 +228,7 @@ mod tests {
 
     #[rstest]
     fn test_edit_series_prompt_scroll_no_op_when_not_ready(#[values(Key::Up, Key::Down)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.is_loading = true;
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
@@ -257,7 +257,7 @@ mod tests {
     #[test]
     fn test_edit_series_select_series_type_home_end() {
       let series_type_vec = Vec::from_iter(SeriesType::iter());
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app
@@ -312,7 +312,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_select_quality_profile_scroll() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app
@@ -371,7 +371,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_select_language_profile_scroll() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app
@@ -430,7 +430,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_path_input_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal {
         path: "Test".into(),
@@ -482,7 +482,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_tags_input_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal {
         tags: "Test".into(),
@@ -544,7 +544,7 @@ mod tests {
 
     #[rstest]
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
 
       EditSeriesHandler::new(key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None).handle();
@@ -558,7 +558,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_path_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal {
         path: "Test".into(),
@@ -610,7 +610,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_tags_input_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal {
         tags: "Test".into(),
@@ -676,7 +676,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_path_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.should_ignore_quit_key = true;
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal {
         path: "Test Path".into(),
@@ -712,7 +712,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_tags_input_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.should_ignore_quit_key = true;
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal {
         tags: "Test Tags".into(),
@@ -748,7 +748,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_prompt_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPrompt.into());
@@ -773,7 +773,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_confirm_prompt_prompt_confirmation_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut edit_series = EditSeriesModal {
         tags: "usenet, testing".to_owned().into(),
         path: "/nfs/Test Path".to_owned().into(),
@@ -840,7 +840,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_confirm_prompt_prompt_confirmation_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
@@ -869,7 +869,7 @@ mod tests {
         ActiveSonarrBlock::EditSeriesPrompt,
         Some(ActiveSonarrBlock::Series),
       ));
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app.data.sonarr_data.selected_block = BlockSelectionState::new(EDIT_SERIES_SELECTION_BLOCKS);
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
@@ -922,7 +922,7 @@ mod tests {
         ActiveSonarrBlock::EditSeriesPrompt,
         Some(ActiveSonarrBlock::Series),
       ));
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app.data.sonarr_data.selected_block = BlockSelectionState::new(EDIT_SERIES_SELECTION_BLOCKS);
       app.data.sonarr_data.selected_block.set_index(0, 1);
@@ -980,7 +980,7 @@ mod tests {
       #[case] selected_block: ActiveSonarrBlock,
       #[case] y_index: usize,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(
@@ -1018,7 +1018,7 @@ mod tests {
     fn test_edit_series_prompt_selected_block_submit_no_op_when_not_ready(
       #[values(1, 2, 3, 4)] y_index: usize,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
@@ -1063,7 +1063,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPrompt.into());
@@ -1109,7 +1109,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
@@ -1127,7 +1127,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_prompt_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPrompt.into());
       app.data.sonarr_data = create_test_sonarr_data();
@@ -1151,7 +1151,7 @@ mod tests {
       active_sonarr_block: ActiveSonarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
@@ -1178,7 +1178,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_path_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal {
         path: "Test".into(),
@@ -1208,7 +1208,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_tags_input_backspace() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal {
         tags: "Test".into(),
@@ -1238,7 +1238,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_path_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
 
@@ -1265,7 +1265,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_tags_input_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
 
@@ -1292,7 +1292,7 @@ mod tests {
 
     #[test]
     fn test_edit_series_confirm_prompt_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut edit_series = EditSeriesModal {
         tags: "usenet, testing".to_owned().into(),
         path: "/nfs/Test Path".to_owned().into(),
@@ -1370,7 +1370,7 @@ mod tests {
 
   #[test]
   fn test_build_edit_series_params() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let mut edit_series = EditSeriesModal {
       tags: "usenet, testing".to_owned().into(),
       path: "/nfs/Test Path".to_owned().into(),
@@ -1423,7 +1423,7 @@ mod tests {
 
   #[test]
   fn test_edit_series_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Series.into());
     app.is_loading = true;
 
@@ -1439,7 +1439,7 @@ mod tests {
 
   #[test]
   fn test_edit_series_handler_is_not_ready_when_edit_series_modal_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Series.into());
     app.is_loading = false;
 
@@ -1455,7 +1455,7 @@ mod tests {
 
   #[test]
   fn test_edit_series_handler_is_ready_when_edit_series_modal_is_some() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Series.into());
     app.is_loading = false;
     app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default());
diff --git a/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs b/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs
index 537dc51..ffe2761 100644
--- a/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs
@@ -31,7 +31,7 @@ mod tests {
       active_sonarr_block: ActiveSonarrBlock,
       #[values(Key::Left, Key::Right)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into());
 
       EpisodeDetailsHandler::new(key, &mut app, active_sonarr_block, None).handle();
@@ -56,7 +56,7 @@ mod tests {
       #[case] right_block: ActiveSonarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
       app.is_loading = is_ready;
@@ -137,7 +137,7 @@ mod tests {
 
     #[test]
     fn test_episode_history_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
 
       EpisodeDetailsHandler::new(
@@ -156,7 +156,7 @@ mod tests {
 
     #[test]
     fn test_episode_history_submit_no_op_when_episode_history_is_empty() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app
         .data
@@ -186,7 +186,7 @@ mod tests {
 
     #[test]
     fn test_episode_history_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::EpisodeHistory.into());
@@ -221,7 +221,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app
         .data
@@ -247,7 +247,7 @@ mod tests {
 
     #[test]
     fn test_manual_episode_search_confirm_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.data.sonarr_data.prompt_confirm = true;
       app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearch.into());
@@ -285,7 +285,7 @@ mod tests {
       )]
       prompt_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into());
       app.push_navigation_stack(prompt_block.into());
@@ -302,7 +302,7 @@ mod tests {
 
     #[test]
     fn test_manual_episode_search_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearch.into());
 
@@ -322,7 +322,7 @@ mod tests {
 
     #[test]
     fn test_manual_episode_search_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearch.into());
@@ -351,7 +351,7 @@ mod tests {
 
     #[test]
     fn test_episode_history_details_block_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::EpisodeHistory.into());
       app.push_navigation_stack(ActiveSonarrBlock::EpisodeHistoryDetails.into());
@@ -379,7 +379,7 @@ mod tests {
       prompt_block: ActiveSonarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.is_loading = is_ready;
       app.data.sonarr_data.prompt_confirm = true;
@@ -405,7 +405,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
       app.push_navigation_stack(active_sonarr_block.into());
@@ -443,7 +443,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(active_sonarr_block.into());
 
@@ -471,7 +471,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(active_sonarr_block.into());
 
@@ -496,7 +496,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(active_sonarr_block.into());
       app.is_routing = false;
@@ -523,7 +523,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.is_loading = true;
       app.push_navigation_stack(active_sonarr_block.into());
@@ -551,7 +551,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app
         .data
@@ -583,7 +583,7 @@ mod tests {
 
     #[test]
     fn test_episode_details_manual_search_confirm_prompt_confirm_confirm_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.data.sonarr_data.prompt_confirm = true;
       app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearch.into());
@@ -627,7 +627,7 @@ mod tests {
 
   #[test]
   fn test_extract_episode_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let mut season_details_modal = SeasonDetailsModal::default();
     season_details_modal.episodes.set_items(vec![episode()]);
     app.data.sonarr_data.season_details_modal = Some(season_details_modal);
@@ -646,7 +646,7 @@ mod tests {
   #[test]
   #[should_panic = "Season details modal is undefined"]
   fn test_extract_episode_id_panics_when_season_details_modal_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
 
     EpisodeDetailsHandler::new(
       DEFAULT_KEYBINDINGS.esc.key,
@@ -659,7 +659,7 @@ mod tests {
 
   #[test]
   fn test_episode_details_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into());
     app.is_loading = true;
 
@@ -675,7 +675,7 @@ mod tests {
 
   #[test]
   fn test_episode_details_handler_is_not_ready_when_season_details_modal_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into());
     app.is_loading = false;
 
@@ -691,7 +691,7 @@ mod tests {
 
   #[test]
   fn test_episode_details_handler_is_not_ready_when_episode_details_modal_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data = create_test_sonarr_data();
     app
       .data
@@ -715,7 +715,7 @@ mod tests {
 
   #[test]
   fn test_episode_details_handler_is_not_ready_when_episode_history_table_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data = create_test_sonarr_data();
     app
       .data
@@ -742,7 +742,7 @@ mod tests {
 
   #[test]
   fn test_episode_details_handler_is_not_ready_when_episode_releases_table_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data = create_test_sonarr_data();
     app
       .data
@@ -772,7 +772,7 @@ mod tests {
     #[values(ActiveSonarrBlock::EpisodeDetails, ActiveSonarrBlock::EpisodeFile)]
     active_sonarr_block: ActiveSonarrBlock,
   ) {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data = create_test_sonarr_data();
     app
       .data
@@ -804,7 +804,7 @@ mod tests {
     )]
     active_sonarr_block: ActiveSonarrBlock,
   ) {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data = create_test_sonarr_data();
     app.push_navigation_stack(active_sonarr_block.into());
     app.is_loading = false;
diff --git a/src/handlers/sonarr_handlers/library/library_handler_tests.rs b/src/handlers/sonarr_handlers/library/library_handler_tests.rs
index 97f057e..8466193 100644
--- a/src/handlers/sonarr_handlers/library/library_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/library_handler_tests.rs
@@ -29,7 +29,7 @@ mod tests {
 
     #[test]
     fn test_series_delete() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -50,7 +50,7 @@ mod tests {
 
     #[test]
     fn test_series_delete_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app
@@ -73,7 +73,7 @@ mod tests {
 
     #[rstest]
     fn test_series_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(0);
 
@@ -94,7 +94,7 @@ mod tests {
 
     #[rstest]
     fn test_series_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(0);
 
@@ -117,7 +117,7 @@ mod tests {
     fn test_left_right_update_all_series_prompt_toggle(
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
 
       LibraryHandler::new(
@@ -153,7 +153,7 @@ mod tests {
 
     #[test]
     fn test_series_details_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -170,7 +170,7 @@ mod tests {
 
     #[test]
     fn test_series_details_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app
@@ -186,7 +186,7 @@ mod tests {
 
     #[test]
     fn test_update_all_series_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -214,7 +214,7 @@ mod tests {
 
     #[test]
     fn test_update_all_series_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -248,7 +248,7 @@ mod tests {
 
     #[test]
     fn test_update_all_series_prompt_blocks_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.push_navigation_stack(ActiveSonarrBlock::UpdateAllSeriesPrompt.into());
       app.data.sonarr_data.prompt_confirm = true;
@@ -267,7 +267,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
@@ -297,7 +297,7 @@ mod tests {
 
     #[test]
     fn test_series_add_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -322,7 +322,7 @@ mod tests {
 
     #[test]
     fn test_series_add_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app
@@ -355,7 +355,7 @@ mod tests {
 
     #[test]
     fn test_series_edit_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app
@@ -378,7 +378,7 @@ mod tests {
 
     #[test]
     fn test_update_all_series_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -401,7 +401,7 @@ mod tests {
 
     #[test]
     fn test_update_all_series_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app
@@ -423,7 +423,7 @@ mod tests {
 
     #[test]
     fn test_refresh_series_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -445,7 +445,7 @@ mod tests {
 
     #[test]
     fn test_refresh_series_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app
         .data
@@ -468,7 +468,7 @@ mod tests {
 
     #[test]
     fn test_update_all_series_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -829,7 +829,7 @@ mod tests {
 
   #[test]
   fn test_library_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
 
     let handler = LibraryHandler::new(
@@ -844,7 +844,7 @@ mod tests {
 
   #[test]
   fn test_library_handler_not_ready_when_series_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
 
     let handler = LibraryHandler::new(
@@ -859,7 +859,7 @@ mod tests {
 
   #[test]
   fn test_library_handler_ready_when_not_loading_and_series_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = false;
     app
       .data
diff --git a/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs b/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs
index 9442e33..3751514 100644
--- a/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs
@@ -30,7 +30,7 @@ mod tests {
 
     #[test]
     fn test_delete_episode_prompt() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
 
@@ -45,7 +45,7 @@ mod tests {
 
     #[test]
     fn test_delete_episode_prompt_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
       app.is_loading = true;
 
@@ -75,7 +75,7 @@ mod tests {
       active_sonarr_block: ActiveSonarrBlock,
       #[values(Key::Left, Key::Right)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
 
       SeasonDetailsHandler::new(key, &mut app, active_sonarr_block, None).handle();
@@ -102,7 +102,7 @@ mod tests {
       #[case] right_block: ActiveSonarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into());
       app.is_loading = is_ready;
@@ -169,7 +169,7 @@ mod tests {
 
     #[test]
     fn test_season_details_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
       app.data.sonarr_data = create_test_sonarr_data();
 
@@ -184,7 +184,7 @@ mod tests {
 
     #[test]
     fn test_season_details_submit_no_op_on_empty_episodes_table() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app
         .data
@@ -206,7 +206,7 @@ mod tests {
 
     #[test]
     fn test_season_details_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
 
@@ -221,7 +221,7 @@ mod tests {
 
     #[test]
     fn test_season_history_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
 
       SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonHistory, None)
@@ -235,7 +235,7 @@ mod tests {
 
     #[test]
     fn test_season_history_submit_no_op_when_season_history_is_empty() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app
         .data
@@ -257,7 +257,7 @@ mod tests {
 
     #[test]
     fn test_season_history_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::SeasonHistory.into());
@@ -286,7 +286,7 @@ mod tests {
       #[values(ActiveSonarrBlock::SeasonDetails, ActiveSonarrBlock::SeasonHistory)]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.data.sonarr_data.prompt_confirm = true;
       app.push_navigation_stack(active_sonarr_block.into());
@@ -304,7 +304,7 @@ mod tests {
 
     #[test]
     fn test_season_details_manual_search_confirm_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.data.sonarr_data.prompt_confirm = true;
       app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearch.into());
@@ -344,7 +344,7 @@ mod tests {
       )]
       prompt_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
       app.push_navigation_stack(prompt_block.into());
@@ -361,7 +361,7 @@ mod tests {
 
     #[test]
     fn test_manual_season_search_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearch.into());
 
@@ -381,7 +381,7 @@ mod tests {
 
     #[test]
     fn test_manual_season_search_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearch.into());
@@ -413,7 +413,7 @@ mod tests {
 
     #[test]
     fn test_season_history_details_block_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::SeasonHistory.into());
       app.push_navigation_stack(ActiveSonarrBlock::SeasonHistoryDetails.into());
@@ -442,7 +442,7 @@ mod tests {
       prompt_block: ActiveSonarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.is_loading = is_ready;
       app.data.sonarr_data.prompt_confirm = true;
@@ -460,7 +460,7 @@ mod tests {
 
     #[test]
     fn test_season_history_esc_resets_filter_if_one_is_set_instead_of_closing_the_window() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       let mut season_history = StatefulTable {
         filter: Some("Test".into()),
@@ -523,7 +523,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into());
       app.push_navigation_stack(active_sonarr_block.into());
@@ -546,7 +546,7 @@ mod tests {
 
     #[test]
     fn test_toggle_monitoring_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app
         .data
@@ -581,7 +581,7 @@ mod tests {
 
     #[test]
     fn test_toggle_monitoring_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
       app.is_routing = false;
@@ -612,7 +612,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(active_sonarr_block.into());
 
@@ -639,7 +639,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(active_sonarr_block.into());
 
@@ -663,7 +663,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(active_sonarr_block.into());
       app.is_routing = false;
@@ -689,7 +689,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.is_loading = true;
       app.push_navigation_stack(active_sonarr_block.into());
@@ -722,7 +722,7 @@ mod tests {
       #[values(ActiveSonarrBlock::SeasonDetails, ActiveSonarrBlock::SeasonHistory)]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.data.sonarr_data.prompt_confirm = true;
       app.push_navigation_stack(active_sonarr_block.into());
@@ -746,7 +746,7 @@ mod tests {
 
     #[test]
     fn test_season_details_manual_search_confirm_prompt_confirm_confirm_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.data.sonarr_data.prompt_confirm = true;
       app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearch.into());
@@ -791,7 +791,7 @@ mod tests {
 
   #[test]
   fn test_extract_episode_file_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data = create_test_sonarr_data();
 
     let episode_file_id = SeasonDetailsHandler::new(
@@ -808,7 +808,7 @@ mod tests {
   #[test]
   #[should_panic(expected = "Season details have not been loaded")]
   fn test_extract_episode_file_id_empty_season_details_modal_panics() {
-    let mut app = App::default();
+    let mut app = App::test_default();
 
     SeasonDetailsHandler::new(
       DEFAULT_KEYBINDINGS.esc.key,
@@ -821,7 +821,7 @@ mod tests {
 
   #[test]
   fn test_extract_episode_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     let mut season_details_modal = SeasonDetailsModal::default();
     season_details_modal.episodes.set_items(vec![episode()]);
     app.data.sonarr_data.season_details_modal = Some(season_details_modal);
@@ -840,7 +840,7 @@ mod tests {
   #[test]
   #[should_panic(expected = "Season details have not been loaded")]
   fn test_extract_episode_id_panic_when_season_details_modal_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
 
     SeasonDetailsHandler::new(
       DEFAULT_KEYBINDINGS.esc.key,
@@ -853,7 +853,7 @@ mod tests {
 
   #[test]
   fn test_extract_series_id_season_number_tuple() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data = create_test_sonarr_data();
 
     let (series_id, season_number) = SeasonDetailsHandler::new(
@@ -870,7 +870,7 @@ mod tests {
 
   #[test]
   fn test_season_details_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
     app.is_loading = true;
 
@@ -886,7 +886,7 @@ mod tests {
 
   #[test]
   fn test_season_details_handler_is_not_ready_when_not_loading_and_season_details_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
 
     let handler = SeasonDetailsHandler::new(
@@ -901,7 +901,7 @@ mod tests {
 
   #[test]
   fn test_season_details_handler_is_not_ready_when_not_loading_and_episodes_table_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
     app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into());
 
@@ -917,7 +917,7 @@ mod tests {
 
   #[test]
   fn test_season_details_handler_is_not_ready_when_not_loading_and_history_table_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
     app.push_navigation_stack(ActiveSonarrBlock::SeasonHistory.into());
 
@@ -933,7 +933,7 @@ mod tests {
 
   #[test]
   fn test_season_details_handler_is_not_ready_when_not_loading_and_releases_table_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default());
     app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearch.into());
 
@@ -956,7 +956,7 @@ mod tests {
     )]
     active_sonarr_block: ActiveSonarrBlock,
   ) {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data = create_test_sonarr_data();
     app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into());
     app.push_navigation_stack(active_sonarr_block.into());
diff --git a/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs b/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
index 9a050ab..cb93842 100644
--- a/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
@@ -30,7 +30,7 @@ mod tests {
       active_sonarr_block: ActiveSonarrBlock,
       #[values(Key::Left, Key::Right)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
 
       SeriesDetailsHandler::new(key, &mut app, active_sonarr_block, None).handle();
@@ -50,7 +50,7 @@ mod tests {
       #[case] right_block: ActiveSonarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
       app.is_loading = is_ready;
       app.push_navigation_stack(right_block.into());
@@ -93,7 +93,7 @@ mod tests {
 
     #[test]
     fn test_series_details_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -111,7 +111,7 @@ mod tests {
 
     #[test]
     fn test_series_details_submit_no_op_on_empty_seasons_table() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into());
 
       SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesDetails, None)
@@ -125,7 +125,7 @@ mod tests {
 
     #[test]
     fn test_series_details_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
 
@@ -137,7 +137,7 @@ mod tests {
 
     #[test]
     fn test_series_history_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut series_history = StatefulTable::default();
       series_history.set_items(vec![SonarrHistoryItem::default()]);
       app.data.sonarr_data.series_history = Some(series_history);
@@ -153,7 +153,7 @@ mod tests {
 
     #[test]
     fn test_series_history_submit_no_op_when_series_history_is_empty() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::SeriesHistory.into());
       app.data.sonarr_data.series_history = Some(StatefulTable::default());
 
@@ -168,7 +168,7 @@ mod tests {
 
     #[test]
     fn test_series_history_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::Series.into());
 
@@ -191,7 +191,7 @@ mod tests {
       #[case] prompt_block: ActiveSonarrBlock,
       #[case] expected_action: SonarrEvent,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.prompt_confirm = true;
       app.data.sonarr_data.series.set_items(vec![series()]);
       app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into());
@@ -218,7 +218,7 @@ mod tests {
       )]
       prompt_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into());
       app.push_navigation_stack(prompt_block.into());
 
@@ -243,7 +243,7 @@ mod tests {
 
     #[test]
     fn test_series_history_details_block_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::SeriesHistory.into());
       app.push_navigation_stack(ActiveSonarrBlock::SeriesHistoryDetails.into());
 
@@ -270,7 +270,7 @@ mod tests {
       prompt_block: ActiveSonarrBlock,
       #[values(true, false)] is_ready: bool,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.data.sonarr_data.prompt_confirm = true;
       app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into());
@@ -287,7 +287,7 @@ mod tests {
 
     #[test]
     fn test_series_history_esc_resets_filter_if_one_is_set_instead_of_closing_the_window() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let series_history = StatefulTable {
         filter: Some("Test".into()),
         filtered_items: Some(vec![SonarrHistoryItem::default()]),
@@ -359,7 +359,7 @@ mod tests {
       #[values(ActiveSonarrBlock::SeriesDetails, ActiveSonarrBlock::SeriesHistory)]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(active_sonarr_block.into());
 
@@ -377,7 +377,7 @@ mod tests {
 
     #[test]
     fn test_toggle_monitoring_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data = create_test_sonarr_data();
       app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into());
       app.is_routing = false;
@@ -404,7 +404,7 @@ mod tests {
 
     #[test]
     fn test_toggle_monitoring_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into());
       app.is_routing = false;
@@ -431,7 +431,7 @@ mod tests {
       #[values(ActiveSonarrBlock::SeriesDetails, ActiveSonarrBlock::SeriesHistory)]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut series_history = StatefulTable::default();
       series_history.set_items(vec![SonarrHistoryItem::default()]);
       app.data.sonarr_data.series_history = Some(series_history);
@@ -456,7 +456,7 @@ mod tests {
       #[values(ActiveSonarrBlock::SeriesDetails, ActiveSonarrBlock::SeriesHistory)]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(active_sonarr_block.into());
 
@@ -476,7 +476,7 @@ mod tests {
       #[values(ActiveSonarrBlock::SeriesDetails, ActiveSonarrBlock::SeriesHistory)]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut series_history = StatefulTable::default();
       series_history.set_items(vec![SonarrHistoryItem::default()]);
       app.data.sonarr_data.series_history = Some(series_history);
@@ -501,7 +501,7 @@ mod tests {
       #[values(ActiveSonarrBlock::SeriesDetails, ActiveSonarrBlock::SeriesHistory)]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(active_sonarr_block.into());
 
@@ -521,7 +521,7 @@ mod tests {
       #[values(ActiveSonarrBlock::SeriesDetails, ActiveSonarrBlock::SeriesHistory)]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut series_history = StatefulTable::default();
       series_history.set_items(vec![SonarrHistoryItem::default()]);
       app.data.sonarr_data.series_history = Some(series_history);
@@ -545,7 +545,7 @@ mod tests {
       #[values(ActiveSonarrBlock::SeriesDetails, ActiveSonarrBlock::SeriesHistory)]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(active_sonarr_block.into());
       app.is_routing = false;
@@ -577,7 +577,7 @@ mod tests {
       #[values(ActiveSonarrBlock::SeriesDetails, ActiveSonarrBlock::SeriesHistory)]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.prompt_confirm = true;
       app.data.sonarr_data.series.set_items(vec![series()]);
       app.push_navigation_stack(active_sonarr_block.into());
@@ -613,7 +613,7 @@ mod tests {
 
   #[test]
   fn test_extract_series_id_season_number_tuple() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.series.set_items(vec![series()]);
     app.data.sonarr_data.seasons.set_items(vec![season()]);
 
@@ -630,7 +630,7 @@ mod tests {
 
   #[test]
   fn test_extract_series_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.series.set_items(vec![series()]);
 
     let series_id = SeriesDetailsHandler::new(
@@ -646,7 +646,7 @@ mod tests {
 
   #[test]
   fn test_series_details_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Series.into());
     app.is_loading = true;
 
@@ -662,7 +662,7 @@ mod tests {
 
   #[test]
   fn test_series_details_handler_is_not_ready_when_not_loading_and_series_history_is_none() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Series.into());
 
     let handler = SeriesDetailsHandler::new(
@@ -677,7 +677,7 @@ mod tests {
 
   #[test]
   fn test_series_details_handler_ready_when_not_loading_and_series_history_is_some() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Series.into());
     app.data.sonarr_data.series_history = Some(StatefulTable::default());
 
@@ -693,7 +693,7 @@ mod tests {
 
   #[test]
   fn test_series_details_handler_ready_when_not_loading_for_series_details() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::Series.into());
 
     let handler = SeriesDetailsHandler::new(
diff --git a/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs b/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs
index 4bd5b49..a18efac 100644
--- a/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs
@@ -22,7 +22,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddRootFolderPrompt.into());
       app
@@ -83,7 +83,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app
         .data
@@ -101,7 +101,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app
@@ -129,7 +129,7 @@ mod tests {
 
     #[rstest]
     fn test_root_folders_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(4);
@@ -151,7 +151,7 @@ mod tests {
 
     #[rstest]
     fn test_root_folders_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(4);
@@ -175,7 +175,7 @@ mod tests {
     fn test_left_right_delete_root_folder_prompt_toggle(
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
 
       RootFoldersHandler::new(
@@ -201,7 +201,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app.data.sonarr_data.edit_root_folder = Some("Test".into());
 
@@ -258,7 +258,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let expected_add_root_folder_body = AddRootFolderBody {
         path: "Test".to_owned(),
       };
@@ -296,7 +296,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_confirm_submit_noop_on_empty_folder() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.edit_root_folder = Some(HorizontallyScrollableText::default());
       app.data.sonarr_data.prompt_confirm = false;
       app.should_ignore_quit_key = true;
@@ -322,7 +322,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -353,7 +353,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -388,7 +388,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt_block_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveSonarrBlock::DeleteRootFolderPrompt.into());
       app.data.sonarr_data.prompt_confirm = true;
@@ -410,7 +410,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app.push_navigation_stack(ActiveSonarrBlock::AddRootFolderPrompt.into());
       app.data.sonarr_data.edit_root_folder = Some("/nfs/test".into());
@@ -436,7 +436,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
@@ -461,7 +461,7 @@ mod tests {
 
     #[test]
     fn test_root_folder_add() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app
         .data
@@ -487,7 +487,7 @@ mod tests {
 
     #[test]
     fn test_root_folder_add_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app
@@ -514,7 +514,7 @@ mod tests {
 
     #[test]
     fn test_refresh_root_folders_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -539,7 +539,7 @@ mod tests {
 
     #[test]
     fn test_refresh_root_folders_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app
         .data
@@ -565,7 +565,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_backspace_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app
         .data
@@ -590,7 +590,7 @@ mod tests {
 
     #[test]
     fn test_add_root_folder_prompt_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
       app
         .data
@@ -615,7 +615,7 @@ mod tests {
 
     #[test]
     fn test_delete_root_folder_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .sonarr_data
@@ -657,7 +657,7 @@ mod tests {
 
   #[test]
   fn test_extract_root_folder_id() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app
       .data
       .sonarr_data
@@ -677,7 +677,7 @@ mod tests {
 
   #[test]
   fn test_build_add_root_folder_body() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.edit_root_folder = Some("/nfs/test".into());
     let expected_add_root_folder_body = AddRootFolderBody {
       path: "/nfs/test".to_owned(),
@@ -697,7 +697,7 @@ mod tests {
 
   #[test]
   fn test_root_folders_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
     app.is_loading = true;
 
@@ -713,7 +713,7 @@ mod tests {
 
   #[test]
   fn test_root_folders_handler_not_ready_when_root_folders_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
     app.is_loading = false;
 
@@ -729,7 +729,7 @@ mod tests {
 
   #[test]
   fn test_root_folders_handler_ready_when_not_loading_and_root_folders_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
     app.is_loading = false;
 
diff --git a/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs b/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs
index b826b94..44135cb 100644
--- a/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs
+++ b/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs
@@ -16,7 +16,7 @@ pub(in crate::handlers::sonarr_handlers) mod utils {
   #[macro_export]
   macro_rules! test_edit_series_key {
     ($handler:ident, $block:expr, $context:expr) => {
-      let mut app = App::default();
+      let mut app = App::test_default();
       let mut sonarr_data = SonarrData {
         quality_profile_map: bimap::BiMap::from_iter([
           (2222, "HD - 1080p".to_owned()),
diff --git a/src/handlers/sonarr_handlers/sonarr_handler_tests.rs b/src/handlers/sonarr_handlers/sonarr_handler_tests.rs
index 784ccb4..b55d07b 100644
--- a/src/handlers/sonarr_handlers/sonarr_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/sonarr_handler_tests.rs
@@ -23,7 +23,7 @@ mod tests {
     #[case] left_block: ActiveSonarrBlock,
     #[case] right_block: ActiveSonarrBlock,
   ) {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.data.sonarr_data.main_tabs.set_index(index);
 
     handle_change_tab_left_right_keys(&mut app, DEFAULT_KEYBINDINGS.left.key);
diff --git a/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs b/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs
index 7dfbe21..18657af 100644
--- a/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs
@@ -39,7 +39,7 @@ mod tests {
     fn test_log_details_scroll_no_op_when_not_ready(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = true;
       app
@@ -71,7 +71,7 @@ mod tests {
     fn test_tasks_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
       app
@@ -99,7 +99,7 @@ mod tests {
     fn test_tasks_scroll_no_op_when_not_ready(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = true;
       app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
@@ -128,7 +128,7 @@ mod tests {
     fn test_queued_events_scroll(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
       app
@@ -158,7 +158,7 @@ mod tests {
     fn test_queued_events_scroll_no_op_when_not_ready(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = true;
       app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
@@ -187,7 +187,7 @@ mod tests {
 
     #[test]
     fn test_system_updates_scroll() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
 
@@ -214,7 +214,7 @@ mod tests {
 
     #[test]
     fn test_system_updates_scroll_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = true;
       app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
@@ -261,7 +261,7 @@ mod tests {
 
     #[test]
     fn test_log_details_home_end_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = true;
       app
@@ -303,7 +303,7 @@ mod tests {
 
     #[test]
     fn test_tasks_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.updates =
         ScrollableText::with_string("Test 1\nTest 2\nTest 3".to_owned());
@@ -342,7 +342,7 @@ mod tests {
 
     #[test]
     fn test_tasks_home_end_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = true;
       app.data.sonarr_data.updates =
@@ -382,7 +382,7 @@ mod tests {
 
     #[test]
     fn test_queued_events_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.updates =
         ScrollableText::with_string("Test 1\nTest 2\nTest 3".to_owned());
@@ -421,7 +421,7 @@ mod tests {
 
     #[test]
     fn test_queued_events_home_end_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = true;
       app.data.sonarr_data.updates =
@@ -461,7 +461,7 @@ mod tests {
 
     #[test]
     fn test_system_updates_home_end() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
 
@@ -488,7 +488,7 @@ mod tests {
 
     #[test]
     fn test_system_updates_home_end_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = true;
       app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
@@ -524,7 +524,7 @@ mod tests {
     #[test]
     fn test_handle_log_details_left_right() {
       let active_sonarr_block = ActiveSonarrBlock::SystemLogs;
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app
         .data
@@ -625,7 +625,7 @@ mod tests {
     fn test_left_right_prompt_toggle(
       #[values(DEFAULT_KEYBINDINGS.left.key, DEFAULT_KEYBINDINGS.right.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
 
       SystemDetailsHandler::new(
@@ -661,7 +661,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned());
 
@@ -676,7 +676,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_submit_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::SystemTasks.into());
       app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned());
@@ -692,7 +692,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_start_task_prompt_confirm_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned());
       app.data.sonarr_data.prompt_confirm = true;
       app
@@ -724,7 +724,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_start_task_prompt_decline_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned());
       app.push_navigation_stack(ActiveSonarrBlock::SystemTasks.into());
       app.push_navigation_stack(ActiveSonarrBlock::SystemTaskStartConfirmPrompt.into());
@@ -757,7 +757,7 @@ mod tests {
 
     #[rstest]
     fn test_esc_system_logs(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app
         .data
@@ -780,7 +780,7 @@ mod tests {
 
     #[rstest]
     fn test_esc_system_tasks(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.push_navigation_stack(ActiveSonarrBlock::SystemTasks.into());
@@ -797,7 +797,7 @@ mod tests {
 
     #[rstest]
     fn test_esc_system_queued_events(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.push_navigation_stack(ActiveSonarrBlock::SystemQueuedEvents.into());
@@ -820,7 +820,7 @@ mod tests {
 
     #[rstest]
     fn test_esc_system_updates(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_ready;
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.push_navigation_stack(ActiveSonarrBlock::SystemUpdates.into());
@@ -832,7 +832,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_start_task_prompt_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::SystemTasks.into());
       app.push_navigation_stack(ActiveSonarrBlock::SystemTaskStartConfirmPrompt.into());
       app.data.sonarr_data.prompt_confirm = true;
@@ -871,7 +871,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned());
       app.push_navigation_stack(active_sonarr_block.into());
@@ -898,7 +898,7 @@ mod tests {
       )]
       active_sonarr_block: ActiveSonarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = true;
       app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned());
@@ -918,7 +918,7 @@ mod tests {
 
     #[test]
     fn test_system_tasks_start_task_prompt_confirm() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned());
       app
@@ -962,7 +962,7 @@ mod tests {
 
   #[test]
   fn test_extract_task_name() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app
       .data
       .sonarr_data
@@ -982,7 +982,7 @@ mod tests {
 
   #[test]
   fn test_system_details_handler_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::System.into());
     app.is_loading = true;
 
@@ -998,7 +998,7 @@ mod tests {
 
   #[test]
   fn test_system_details_handler_not_ready_when_log_details_and_updates_and_tasks_are_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::System.into());
     app.is_loading = false;
 
@@ -1014,7 +1014,7 @@ mod tests {
 
   #[test]
   fn test_system_details_handler_ready_when_not_loading_and_log_details_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::System.into());
     app.is_loading = false;
     app
@@ -1035,7 +1035,7 @@ mod tests {
 
   #[test]
   fn test_system_details_handler_ready_when_not_loading_and_tasks_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::System.into());
     app.is_loading = false;
     app
@@ -1056,7 +1056,7 @@ mod tests {
 
   #[test]
   fn test_system_details_handler_ready_when_not_loading_and_updates_is_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::System.into());
     app.is_loading = false;
     app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned());
diff --git a/src/handlers/sonarr_handlers/system/system_handler_tests.rs b/src/handlers/sonarr_handlers/system/system_handler_tests.rs
index 46ad601..9b866de 100644
--- a/src/handlers/sonarr_handlers/system/system_handler_tests.rs
+++ b/src/handlers/sonarr_handlers/system/system_handler_tests.rs
@@ -22,7 +22,7 @@ mod tests {
 
     #[rstest]
     fn test_system_tab_left(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(6);
@@ -44,7 +44,7 @@ mod tests {
 
     #[rstest]
     fn test_system_tab_right(#[values(true, false)] is_ready: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.is_loading = is_ready;
       app.data.sonarr_data.main_tabs.set_index(6);
@@ -74,7 +74,7 @@ mod tests {
 
     #[rstest]
     fn test_default_esc(#[values(true, false)] is_loading: bool) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = is_loading;
       app.error = "test error".to_owned().into();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
@@ -96,7 +96,7 @@ mod tests {
 
     #[test]
     fn test_update_system_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.logs.set_items(vec![
         HorizontallyScrollableText::from("test 1"),
@@ -129,7 +129,7 @@ mod tests {
 
     #[test]
     fn test_update_system_key_no_op_if_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.logs.set_items(vec![
@@ -160,7 +160,7 @@ mod tests {
 
     #[test]
     fn test_queued_events_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.logs.set_items(vec![
         HorizontallyScrollableText::from("test 1"),
@@ -193,7 +193,7 @@ mod tests {
 
     #[test]
     fn test_queued_events_key_no_op_if_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.logs.set_items(vec![
@@ -224,7 +224,7 @@ mod tests {
 
     #[test]
     fn test_refresh_system_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.sonarr_data.logs.set_items(vec![
         HorizontallyScrollableText::from("test 1"),
         HorizontallyScrollableText::from("test 2"),
@@ -255,7 +255,7 @@ mod tests {
 
     #[test]
     fn test_refresh_system_key_no_op_if_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.logs.set_items(vec![
@@ -288,7 +288,7 @@ mod tests {
 
     #[test]
     fn test_logs_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.logs.set_items(vec![
         HorizontallyScrollableText::from("test 1"),
@@ -329,7 +329,7 @@ mod tests {
 
     #[test]
     fn test_logs_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.logs.set_items(vec![
@@ -361,7 +361,7 @@ mod tests {
 
     #[test]
     fn test_tasks_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.logs.set_items(vec![
         HorizontallyScrollableText::from("test 1"),
@@ -394,7 +394,7 @@ mod tests {
 
     #[test]
     fn test_tasks_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveSonarrBlock::System.into());
       app.data.sonarr_data.logs.set_items(vec![
@@ -458,7 +458,7 @@ mod tests {
 
   #[test]
   fn test_system_handler_is_not_ready_when_loading() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::System.into());
     app.is_loading = true;
 
@@ -474,7 +474,7 @@ mod tests {
 
   #[test]
   fn test_system_handler_is_not_ready_when_logs_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::System.into());
     app.is_loading = false;
     app
@@ -500,7 +500,7 @@ mod tests {
 
   #[test]
   fn test_system_handler_is_not_ready_when_tasks_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::System.into());
     app.is_loading = false;
     app.data.sonarr_data.logs.set_items(vec!["test".into()]);
@@ -522,7 +522,7 @@ mod tests {
 
   #[test]
   fn test_system_handler_is_not_ready_when_queued_events_is_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::System.into());
     app.is_loading = false;
     app.data.sonarr_data.logs.set_items(vec!["test".into()]);
@@ -544,7 +544,7 @@ mod tests {
 
   #[test]
   fn test_system_handler_is_ready_when_all_required_tables_are_not_empty() {
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.push_navigation_stack(ActiveSonarrBlock::System.into());
     app.is_loading = false;
     app.data.sonarr_data.logs.set_items(vec!["test".into()]);
diff --git a/src/handlers/table_handler_tests.rs b/src/handlers/table_handler_tests.rs
index c872147..b7119fb 100644
--- a/src/handlers/table_handler_tests.rs
+++ b/src/handlers/table_handler_tests.rs
@@ -115,7 +115,7 @@ mod tests {
     fn test_table_scroll_no_op_when_not_ready(
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app
         .data
@@ -158,7 +158,7 @@ mod tests {
       #[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
     ) {
       let movie_field_vec = sort_options();
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.movies.sorting(sort_options());
 
       if key == Key::Up {
@@ -219,7 +219,7 @@ mod tests {
 
     #[test]
     fn test_table_home_end_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app
         .data
@@ -271,7 +271,7 @@ mod tests {
 
     #[test]
     fn test_movie_search_box_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
       app
         .data
@@ -325,7 +325,7 @@ mod tests {
 
     #[test]
     fn test_movie_filter_box_home_end_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
       app
         .data
@@ -380,7 +380,7 @@ mod tests {
     #[test]
     fn test_table_sort_home_end() {
       let movie_field_vec = sort_options();
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.movies.sorting(sort_options());
 
       TableHandlerUnit::new(
@@ -433,7 +433,7 @@ mod tests {
 
     #[test]
     fn test_movie_search_box_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
       app
         .data
@@ -487,7 +487,7 @@ mod tests {
 
     #[test]
     fn test_movie_filter_box_left_right_keys() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
       app
         .data
@@ -552,7 +552,7 @@ mod tests {
 
     #[test]
     fn test_search_movie_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
       app
@@ -576,7 +576,7 @@ mod tests {
 
     #[test]
     fn test_search_movie_submit_error_on_no_search_hits() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
       app
@@ -603,7 +603,7 @@ mod tests {
 
     #[test]
     fn test_search_filtered_table_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -632,7 +632,7 @@ mod tests {
 
     #[test]
     fn test_filter_table_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
       app
@@ -669,7 +669,7 @@ mod tests {
 
     #[test]
     fn test_filter_table_submit_error_on_no_filter_matches() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
       app
@@ -694,7 +694,7 @@ mod tests {
 
     #[test]
     fn test_table_sort_prompt_submit() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.movies.sort_asc = true;
       app.data.radarr_data.movies.sorting(sort_options());
       app.data.radarr_data.movies.set_items(movies_vec());
@@ -734,7 +734,7 @@ mod tests {
       #[values(ActiveRadarrBlock::SearchMovie, ActiveRadarrBlock::SearchMovieError)]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(active_radarr_block.into());
@@ -753,7 +753,7 @@ mod tests {
       #[values(ActiveRadarrBlock::FilterMovies, ActiveRadarrBlock::FilterMoviesError)]
       active_radarr_block: ActiveRadarrBlock,
     ) {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(active_radarr_block.into());
@@ -781,7 +781,7 @@ mod tests {
 
     #[test]
     fn test_table_sort_prompt_block_esc() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.data.radarr_data.movies.set_items(movies_vec());
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::MoviesSortPrompt.into());
@@ -801,7 +801,7 @@ mod tests {
 
     #[test]
     fn test_search_table_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -829,7 +829,7 @@ mod tests {
 
     #[test]
     fn test_search_table_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app
@@ -853,7 +853,7 @@ mod tests {
 
     #[test]
     fn test_search_table_key_no_op_when_search_table_block_is_not_defined() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -875,7 +875,7 @@ mod tests {
 
     #[test]
     fn test_filter_table_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -900,7 +900,7 @@ mod tests {
 
     #[test]
     fn test_filter_table_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app
@@ -924,7 +924,7 @@ mod tests {
 
     #[test]
     fn test_filter_table_key_resets_previous_filter() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.should_ignore_quit_key = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.data.radarr_data = create_test_radarr_data();
@@ -958,7 +958,7 @@ mod tests {
 
     #[test]
     fn test_filter_table_key_no_op_when_filter_table_block_is_not_defined() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -980,7 +980,7 @@ mod tests {
 
     #[test]
     fn test_search_table_box_backspace_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
       app.data.radarr_data.movies.search = Some("Test".into());
       app
@@ -1005,7 +1005,7 @@ mod tests {
 
     #[test]
     fn test_filter_table_box_backspace_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
       app
         .data
@@ -1030,7 +1030,7 @@ mod tests {
 
     #[test]
     fn test_search_table_box_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
       app
         .data
@@ -1055,7 +1055,7 @@ mod tests {
 
     #[test]
     fn test_filter_table_box_char_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
       app
         .data
@@ -1080,7 +1080,7 @@ mod tests {
 
     #[test]
     fn test_sort_key() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
@@ -1108,7 +1108,7 @@ mod tests {
 
     #[test]
     fn test_sort_key_no_op_when_not_ready() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app.is_loading = true;
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app
@@ -1131,7 +1131,7 @@ mod tests {
 
     #[test]
     fn test_sort_key_no_op_when_sort_table_block_is_undefined() {
-      let mut app = App::default();
+      let mut app = App::test_default();
       app
         .data
         .radarr_data
diff --git a/src/main.rs b/src/main.rs
index aa9238b..c662e9e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,3 @@
-#![warn(rust_2021_compatibility)]
-
 use anyhow::Result;
 use std::panic::PanicHookInfo;
 use std::path::PathBuf;
diff --git a/src/models/mod.rs b/src/models/mod.rs
index 3d95a95..4c54688 100644
--- a/src/models/mod.rs
+++ b/src/models/mod.rs
@@ -297,6 +297,10 @@ impl TabState {
   }
 
   pub fn get_active_config(&self) -> &Option<ServarrConfig> {
+    if self.tabs.is_empty() {
+      return &None;
+    }
+    
     &self.tabs[self.index].config
   }
 
diff --git a/src/models/model_tests.rs b/src/models/model_tests.rs
index 0514577..c7b60c5 100644
--- a/src/models/model_tests.rs
+++ b/src/models/model_tests.rs
@@ -9,7 +9,7 @@ mod tests {
   use serde::de::value::I64Deserializer;
   use serde::de::IntoDeserializer;
   use serde_json::to_string;
-
+  use crate::app::ServarrConfig;
   use crate::models::from_f64;
   use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
   use crate::models::{from_i64, strip_non_search_characters};
@@ -512,6 +512,31 @@ mod tests {
 
     assert_eq!(active_route, second_tab);
   }
+  
+  #[test]
+  fn test_tab_state_get_active_config() {
+    let mut tabs = create_test_tab_routes();
+    tabs[1].config = Some(ServarrConfig {
+      name: Some("Test".to_owned()),
+      ..ServarrConfig::default()
+    });
+    let tab_state = TabState { tabs, index: 1 };
+    
+    let active_config = tab_state.get_active_config();
+    
+    assert!(active_config.is_some());
+    assert_str_eq!(active_config.clone().unwrap().name.unwrap(), "Test");
+  }
+
+  #[test]
+  fn test_tab_state_get_active_config_defaults_to_none() {
+    let tabs = create_test_tab_routes();
+    let tab_state = TabState { tabs, index: 1 };
+
+    let active_config = tab_state.get_active_config();
+
+    assert!(active_config.is_none());
+  }
 
   #[test]
   fn test_tab_state_get_active_tab_help() {
@@ -718,16 +743,18 @@ mod tests {
   fn create_test_tab_routes() -> Vec<TabRoute> {
     vec![
       TabRoute {
-        title: "Test 1",
+        title: "Test 1".to_owned(),
         route: ActiveRadarrBlock::Movies.into(),
         help: "Help for Test 1".to_owned(),
         contextual_help: Some("Contextual Help for Test 1".to_owned()),
+        config: None,
       },
       TabRoute {
-        title: "Test 2",
+        title: "Test 2".to_owned(),
         route: ActiveRadarrBlock::Collections.into(),
         help: "Help for Test 2".to_owned(),
         contextual_help: Some("Contextual Help for Test 2".to_owned()),
+        config: None,
       },
     ]
   }
diff --git a/src/models/servarr_data/radarr/radarr_data_tests.rs b/src/models/servarr_data/radarr/radarr_data_tests.rs
index 04590c9..7ff699e 100644
--- a/src/models/servarr_data/radarr/radarr_data_tests.rs
+++ b/src/models/servarr_data/radarr/radarr_data_tests.rs
@@ -112,6 +112,7 @@ mod tests {
         radarr_data.main_tabs.tabs[0].contextual_help,
         Some(build_context_clue_string(&LIBRARY_CONTEXT_CLUES))
       );
+      assert_eq!(radarr_data.main_tabs.tabs[0].config, None);
 
       assert_str_eq!(radarr_data.main_tabs.tabs[1].title, "Collections");
       assert_eq!(
@@ -123,6 +124,7 @@ mod tests {
         radarr_data.main_tabs.tabs[1].contextual_help,
         Some(build_context_clue_string(&COLLECTIONS_CONTEXT_CLUES))
       );
+      assert_eq!(radarr_data.main_tabs.tabs[1].config, None);
 
       assert_str_eq!(radarr_data.main_tabs.tabs[2].title, "Downloads");
       assert_eq!(
@@ -134,6 +136,7 @@ mod tests {
         radarr_data.main_tabs.tabs[2].contextual_help,
         Some(build_context_clue_string(&DOWNLOADS_CONTEXT_CLUES))
       );
+      assert_eq!(radarr_data.main_tabs.tabs[2].config, None);
 
       assert_str_eq!(radarr_data.main_tabs.tabs[3].title, "Blocklist");
       assert_eq!(
@@ -145,6 +148,7 @@ mod tests {
         radarr_data.main_tabs.tabs[3].contextual_help,
         Some(build_context_clue_string(&BLOCKLIST_CONTEXT_CLUES))
       );
+      assert_eq!(radarr_data.main_tabs.tabs[3].config, None);
 
       assert_str_eq!(radarr_data.main_tabs.tabs[4].title, "Root Folders");
       assert_eq!(
@@ -156,6 +160,7 @@ mod tests {
         radarr_data.main_tabs.tabs[4].contextual_help,
         Some(build_context_clue_string(&ROOT_FOLDERS_CONTEXT_CLUES))
       );
+      assert_eq!(radarr_data.main_tabs.tabs[4].config, None);
 
       assert_str_eq!(radarr_data.main_tabs.tabs[5].title, "Indexers");
       assert_eq!(
@@ -167,6 +172,7 @@ mod tests {
         radarr_data.main_tabs.tabs[5].contextual_help,
         Some(build_context_clue_string(&INDEXERS_CONTEXT_CLUES))
       );
+      assert_eq!(radarr_data.main_tabs.tabs[5].config, None);
 
       assert_str_eq!(radarr_data.main_tabs.tabs[6].title, "System");
       assert_eq!(
@@ -178,6 +184,7 @@ mod tests {
         radarr_data.main_tabs.tabs[6].contextual_help,
         Some(build_context_clue_string(&SYSTEM_CONTEXT_CLUES))
       );
+      assert_eq!(radarr_data.main_tabs.tabs[6].config, None);
 
       assert_eq!(radarr_data.movie_info_tabs.tabs.len(), 6);
 
@@ -193,6 +200,7 @@ mod tests {
       assert!(radarr_data.movie_info_tabs.tabs[0]
         .contextual_help
         .is_none());
+      assert_eq!(radarr_data.movie_info_tabs.tabs[0].config, None);
 
       assert_str_eq!(radarr_data.movie_info_tabs.tabs[1].title, "History");
       assert_eq!(
@@ -206,6 +214,7 @@ mod tests {
       assert!(radarr_data.movie_info_tabs.tabs[1]
         .contextual_help
         .is_none());
+      assert_eq!(radarr_data.movie_info_tabs.tabs[1].config, None);
 
       assert_str_eq!(radarr_data.movie_info_tabs.tabs[2].title, "File");
       assert_eq!(
@@ -219,6 +228,7 @@ mod tests {
       assert!(radarr_data.movie_info_tabs.tabs[2]
         .contextual_help
         .is_none());
+      assert_eq!(radarr_data.movie_info_tabs.tabs[2].config, None);
 
       assert_str_eq!(radarr_data.movie_info_tabs.tabs[3].title, "Cast");
       assert_eq!(
@@ -232,6 +242,7 @@ mod tests {
       assert!(radarr_data.movie_info_tabs.tabs[3]
         .contextual_help
         .is_none());
+      assert_eq!(radarr_data.movie_info_tabs.tabs[3].config, None);
 
       assert_str_eq!(radarr_data.movie_info_tabs.tabs[4].title, "Crew");
       assert_eq!(
@@ -245,6 +256,7 @@ mod tests {
       assert!(radarr_data.movie_info_tabs.tabs[4]
         .contextual_help
         .is_none());
+      assert_eq!(radarr_data.movie_info_tabs.tabs[4].config, None);
 
       assert_str_eq!(radarr_data.movie_info_tabs.tabs[5].title, "Manual Search");
       assert_eq!(
@@ -261,6 +273,7 @@ mod tests {
           &MANUAL_MOVIE_SEARCH_CONTEXTUAL_CONTEXT_CLUES
         ))
       );
+      assert_eq!(radarr_data.movie_info_tabs.tabs[5].config, None);
     }
   }
 
diff --git a/src/models/servarr_data/sonarr/modals_tests.rs b/src/models/servarr_data/sonarr/modals_tests.rs
index 5fa55e3..e9d1e29 100644
--- a/src/models/servarr_data/sonarr/modals_tests.rs
+++ b/src/models/servarr_data/sonarr/modals_tests.rs
@@ -264,6 +264,7 @@ mod tests {
     assert!(episode_details_modal.episode_details_tabs.tabs[0]
       .contextual_help
       .is_none());
+    assert_eq!(episode_details_modal.episode_details_tabs.tabs[0].config, None);
 
     assert_str_eq!(
       episode_details_modal.episode_details_tabs.tabs[1].title,
@@ -281,6 +282,7 @@ mod tests {
       episode_details_modal.episode_details_tabs.tabs[1].contextual_help,
       Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
     );
+    assert_eq!(episode_details_modal.episode_details_tabs.tabs[1].config, None);
 
     assert_str_eq!(
       episode_details_modal.episode_details_tabs.tabs[2].title,
@@ -297,6 +299,7 @@ mod tests {
     assert!(episode_details_modal.episode_details_tabs.tabs[2]
       .contextual_help
       .is_none());
+    assert_eq!(episode_details_modal.episode_details_tabs.tabs[2].config, None);
 
     assert_str_eq!(
       episode_details_modal.episode_details_tabs.tabs[3].title,
@@ -314,6 +317,7 @@ mod tests {
       episode_details_modal.episode_details_tabs.tabs[3].contextual_help,
       Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
     );
+    assert_eq!(episode_details_modal.episode_details_tabs.tabs[3].config, None);
   }
 
   #[test]
@@ -346,6 +350,7 @@ mod tests {
         &SEASON_DETAILS_CONTEXTUAL_CONTEXT_CLUES
       ))
     );
+    assert_eq!(season_details_modal.season_details_tabs.tabs[0].config, None);
 
     assert_str_eq!(
       season_details_modal.season_details_tabs.tabs[1].title,
@@ -363,6 +368,7 @@ mod tests {
       season_details_modal.season_details_tabs.tabs[1].contextual_help,
       Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
     );
+    assert_eq!(season_details_modal.season_details_tabs.tabs[1].config, None);
 
     assert_str_eq!(
       season_details_modal.season_details_tabs.tabs[2].title,
@@ -380,5 +386,6 @@ mod tests {
       season_details_modal.season_details_tabs.tabs[2].contextual_help,
       Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
     );
+    assert_eq!(season_details_modal.season_details_tabs.tabs[2].config, None);
   }
 }
diff --git a/src/models/servarr_data/sonarr/sonarr_data_tests.rs b/src/models/servarr_data/sonarr/sonarr_data_tests.rs
index 36d18bd..2ddd1e8 100644
--- a/src/models/servarr_data/sonarr/sonarr_data_tests.rs
+++ b/src/models/servarr_data/sonarr/sonarr_data_tests.rs
@@ -128,6 +128,7 @@ mod tests {
         sonarr_data.main_tabs.tabs[0].contextual_help,
         Some(build_context_clue_string(&SERIES_CONTEXT_CLUES))
       );
+      assert_eq!(sonarr_data.main_tabs.tabs[0].config, None);
 
       assert_str_eq!(sonarr_data.main_tabs.tabs[1].title, "Downloads");
       assert_eq!(
@@ -139,6 +140,7 @@ mod tests {
         sonarr_data.main_tabs.tabs[1].contextual_help,
         Some(build_context_clue_string(&DOWNLOADS_CONTEXT_CLUES))
       );
+      assert_eq!(sonarr_data.main_tabs.tabs[1].config, None);
 
       assert_str_eq!(sonarr_data.main_tabs.tabs[2].title, "Blocklist");
       assert_eq!(
@@ -150,6 +152,7 @@ mod tests {
         sonarr_data.main_tabs.tabs[2].contextual_help,
         Some(build_context_clue_string(&BLOCKLIST_CONTEXT_CLUES))
       );
+      assert_eq!(sonarr_data.main_tabs.tabs[2].config, None);
 
       assert_str_eq!(sonarr_data.main_tabs.tabs[3].title, "History");
       assert_eq!(
@@ -161,6 +164,7 @@ mod tests {
         sonarr_data.main_tabs.tabs[3].contextual_help,
         Some(build_context_clue_string(&HISTORY_CONTEXT_CLUES))
       );
+      assert_eq!(sonarr_data.main_tabs.tabs[3].config, None);
 
       assert_str_eq!(sonarr_data.main_tabs.tabs[4].title, "Root Folders");
       assert_eq!(
@@ -172,6 +176,7 @@ mod tests {
         sonarr_data.main_tabs.tabs[4].contextual_help,
         Some(build_context_clue_string(&ROOT_FOLDERS_CONTEXT_CLUES))
       );
+      assert_eq!(sonarr_data.main_tabs.tabs[4].config, None);
 
       assert_str_eq!(sonarr_data.main_tabs.tabs[5].title, "Indexers");
       assert_eq!(
@@ -183,6 +188,7 @@ mod tests {
         sonarr_data.main_tabs.tabs[5].contextual_help,
         Some(build_context_clue_string(&INDEXERS_CONTEXT_CLUES))
       );
+      assert_eq!(sonarr_data.main_tabs.tabs[5].config, None);
 
       assert_str_eq!(sonarr_data.main_tabs.tabs[6].title, "System");
       assert_eq!(
@@ -194,6 +200,7 @@ mod tests {
         sonarr_data.main_tabs.tabs[6].contextual_help,
         Some(build_context_clue_string(&SYSTEM_CONTEXT_CLUES))
       );
+      assert_eq!(sonarr_data.main_tabs.tabs[6].config, None);
 
       assert_eq!(sonarr_data.series_info_tabs.tabs.len(), 2);
 
@@ -207,6 +214,7 @@ mod tests {
         sonarr_data.series_info_tabs.tabs[0].contextual_help,
         Some(build_context_clue_string(&SERIES_DETAILS_CONTEXT_CLUES))
       );
+      assert_eq!(sonarr_data.series_info_tabs.tabs[0].config, None);
 
       assert_str_eq!(sonarr_data.series_info_tabs.tabs[1].title, "History");
       assert_eq!(
@@ -218,6 +226,7 @@ mod tests {
         sonarr_data.series_info_tabs.tabs[1].contextual_help,
         Some(build_context_clue_string(&SERIES_HISTORY_CONTEXT_CLUES))
       );
+      assert_eq!(sonarr_data.series_info_tabs.tabs[1].config, None);
     }
   }
 
diff --git a/src/network/mod.rs b/src/network/mod.rs
index 21fb7ab..5e86fa6 100644
--- a/src/network/mod.rs
+++ b/src/network/mod.rs
@@ -15,7 +15,7 @@ use tokio::sync::{Mutex, MutexGuard};
 use tokio_util::sync::CancellationToken;
 
 use crate::app::{App, ServarrConfig};
-use crate::models::{Route, Serdeable};
+use crate::models::Serdeable;
 use crate::network::radarr_network::RadarrEvent;
 #[cfg(test)]
 use mockall::automock;
@@ -218,10 +218,9 @@ impl<'a, 'b> Network<'a, 'b> {
       .get_active_config()
       .as_ref()
       .expect("Servarr config is undefined");
-    let default_port = match app.get_current_route() {
-      Route::Radarr(_, _) => 7878,
-      Route::Sonarr(_, _) => 8989,
-      _ => 0,
+    let default_port = match network_event.into() {
+      NetworkEvent::Radarr(_) => 7878,
+      NetworkEvent::Sonarr(_) => 8989,
     };
     let mut uri = if let Some(servarr_uri) = uri {
       format!("{servarr_uri}/api/v3{resource}")
diff --git a/src/network/network_tests.rs b/src/network/network_tests.rs
index 6c2927c..910d401 100644
--- a/src/network/network_tests.rs
+++ b/src/network/network_tests.rs
@@ -34,7 +34,7 @@ mod tests {
         .parse()
         .unwrap(),
     );
-    let mut app = App::default();
+    let mut app = App::test_default();
     app.is_loading = true;
     let radarr_config = ServarrConfig {
       host,
@@ -43,7 +43,7 @@ mod tests {
       ssl_cert_path: None,
       ..ServarrConfig::default()
     };
-    app.config.radarr = Some(radarr_config);
+    app.server_tabs.tabs[0].config = Some(radarr_config);
     let app_arc = Arc::new(Mutex::new(app));
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
@@ -68,7 +68,7 @@ mod tests {
       .with_status(200)
       .create_async()
       .await;
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     let _ = network
@@ -218,7 +218,7 @@ mod tests {
       .with_body(r#"{ "invalid": "INVALID" }"#)
       .create_async()
       .await;
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     let resp = network
@@ -250,7 +250,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_handle_request_failure_to_send_request() {
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     let resp = network
@@ -368,8 +368,8 @@ mod tests {
 
     if request_method == RequestMethod::Post {
       async_server = async_server.with_body(
-        r#"{ 
-        "value": "Test" 
+        r#"{
+        "value": "Test"
       }"#,
       );
       body = Some(Test {
@@ -378,7 +378,7 @@ mod tests {
     }
 
     async_server = async_server.create_async().await;
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     network
@@ -398,31 +398,16 @@ mod tests {
   }
 
   #[tokio::test]
-  #[should_panic(expected = "Radarr config undefined")]
-  async fn test_request_props_from_requires_radarr_config_to_be_present_for_radarr_events() {
+  #[should_panic(expected = "Servarr config is undefined")]
+  #[rstest]
+  async fn test_request_props_from_requires_radarr_config_to_be_present_for_all_network_events(
+    #[values(RadarrEvent::HealthCheck, SonarrEvent::HealthCheck)] network_event: impl Into<NetworkEvent> + NetworkResource) {
     let app_arc = Arc::new(Mutex::new(App::default()));
     let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     network
       .request_props_from(
-        RadarrEvent::GetMovies,
-        RequestMethod::Get,
-        None::<()>,
-        None,
-        None,
-      )
-      .await;
-  }
-
-  #[tokio::test]
-  #[should_panic(expected = "Sonarr config undefined")]
-  async fn test_request_props_from_requires_sonarr_config_to_be_present_for_sonarr_events() {
-    let app_arc = Arc::new(Mutex::new(App::default()));
-    let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    network
-      .request_props_from(
-        SonarrEvent::ListSeries,
+        network_event,
         RequestMethod::Get,
         None::<()>,
         None,
@@ -439,13 +424,14 @@ mod tests {
     #[case] network_event: impl Into<NetworkEvent> + NetworkResource,
     #[case] default_port: u16,
   ) {
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
     let resource = network_event.resource();
-    app_arc.lock().await.config = AppConfig {
-      radarr: Some(ServarrConfig::default()),
-      sonarr: Some(ServarrConfig::default()),
-    };
+    {
+      let mut app = app_arc.lock().await;
+      app.server_tabs.tabs[0].config = Some(ServarrConfig::default());
+      app.server_tabs.tabs[1].config = Some(ServarrConfig::default());
+    }
 
     let request_props = network
       .request_props_from(network_event, RequestMethod::Get, None::<()>, None, None)
@@ -467,7 +453,7 @@ mod tests {
       + NetworkResource,
   ) {
     let api_token = "testToken1234".to_owned();
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let resource = network_event.resource();
     let servarr_config = ServarrConfig {
       host: Some("192.168.0.123".to_owned()),
@@ -478,8 +464,8 @@ mod tests {
     };
     {
       let mut app = app_arc.lock().await;
-      app.config.radarr = Some(servarr_config.clone());
-      app.config.sonarr = Some(servarr_config);
+      app.server_tabs.tabs[0].config = Some(servarr_config.clone());
+      app.server_tabs.tabs[1].config = Some(servarr_config);
     }
     let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
@@ -503,7 +489,7 @@ mod tests {
       + NetworkResource,
   ) {
     let api_token = "testToken1234".to_owned();
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let resource = network_event.resource();
     let servarr_config = ServarrConfig {
       uri: Some("https://192.168.0.123:8080".to_owned()),
@@ -512,8 +498,8 @@ mod tests {
     };
     {
       let mut app = app_arc.lock().await;
-      app.config.radarr = Some(servarr_config.clone());
-      app.config.sonarr = Some(servarr_config);
+      app.server_tabs.tabs[0].config = Some(servarr_config.clone());
+      app.server_tabs.tabs[1].config = Some(servarr_config);
     }
     let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
@@ -538,13 +524,14 @@ mod tests {
     #[case] network_event: impl Into<NetworkEvent> + NetworkResource,
     #[case] default_port: u16,
   ) {
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
     let resource = network_event.resource();
-    app_arc.lock().await.config = AppConfig {
-      radarr: Some(ServarrConfig::default()),
-      sonarr: Some(ServarrConfig::default()),
-    };
+    {
+      let mut app = app_arc.lock().await;
+      app.server_tabs.tabs[0].config = Some(ServarrConfig::default());
+      app.server_tabs.tabs[1].config = Some(ServarrConfig::default());
+    }
 
     let request_props = network
       .request_props_from(
@@ -572,7 +559,7 @@ mod tests {
       + NetworkResource,
   ) {
     let api_token = "testToken1234".to_owned();
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let resource = network_event.resource();
     let servarr_config = ServarrConfig {
       host: Some("192.168.0.123".to_owned()),
@@ -583,8 +570,8 @@ mod tests {
     };
     {
       let mut app = app_arc.lock().await;
-      app.config.radarr = Some(servarr_config.clone());
-      app.config.sonarr = Some(servarr_config);
+      app.server_tabs.tabs[0].config = Some(servarr_config.clone());
+      app.server_tabs.tabs[1].config = Some(servarr_config);
     }
     let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
@@ -614,7 +601,7 @@ mod tests {
       + NetworkResource,
   ) {
     let api_token = "testToken1234".to_owned();
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let resource = network_event.resource();
     let servarr_config = ServarrConfig {
       uri: Some("https://192.168.0.123:8080".to_owned()),
@@ -623,8 +610,8 @@ mod tests {
     };
     {
       let mut app = app_arc.lock().await;
-      app.config.radarr = Some(servarr_config.clone());
-      app.config.sonarr = Some(servarr_config);
+      app.server_tabs.tabs[0].config = Some(servarr_config.clone());
+      app.server_tabs.tabs[1].config = Some(servarr_config);
     }
     let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
@@ -665,14 +652,14 @@ mod tests {
 
     if has_response_body {
       async_server = async_server.with_body(
-        r#"{ 
-        "value": "Test" 
+        r#"{
+        "value": "Test"
       }"#,
       );
     }
 
     async_server = async_server.create_async().await;
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
 
     (async_server, app_arc, server)
   }
@@ -734,7 +721,7 @@ pub(in crate::network) mod test_utils {
         .parse()
         .unwrap(),
     );
-    let mut app = App::default();
+    let mut app = App::test_default();
     let servarr_config = ServarrConfig {
       host,
       port,
@@ -743,8 +730,8 @@ pub(in crate::network) mod test_utils {
     };
 
     match network_event.into() {
-      NetworkEvent::Radarr(_) => app.config.radarr = Some(servarr_config),
-      NetworkEvent::Sonarr(_) => app.config.sonarr = Some(servarr_config),
+      NetworkEvent::Radarr(_) => app.server_tabs.tabs[0].config = Some(servarr_config),
+      NetworkEvent::Sonarr(_) => app.server_tabs.tabs[1].config = Some(servarr_config),
     }
 
     let app_arc = Arc::new(Mutex::new(app));
diff --git a/src/network/radarr_network_tests.rs b/src/network/radarr_network_tests.rs
index c583cea..1019192 100644
--- a/src/network/radarr_network_tests.rs
+++ b/src/network/radarr_network_tests.rs
@@ -3866,7 +3866,7 @@ mod test {
 
   #[tokio::test]
   async fn test_extract_and_add_radarr_tag_ids_vec() {
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let tags = "    test,HI ,, usenet ";
     {
       let mut app = app_arc.lock().await;
diff --git a/src/network/sonarr_network_tests.rs b/src/network/sonarr_network_tests.rs
index 8b39d88..cf48d0e 100644
--- a/src/network/sonarr_network_tests.rs
+++ b/src/network/sonarr_network_tests.rs
@@ -319,6 +319,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -382,6 +383,7 @@ mod test {
     .await;
     app_arc.lock().await.data.sonarr_data.tags_map =
       BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -437,6 +439,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -463,6 +466,7 @@ mod test {
     .await;
     app_arc.lock().await.data.sonarr_data.tags_map =
       BiMap::from_iter([(1, "usenet".to_owned()), (2, "test".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Tag(tag) = network
@@ -517,6 +521,7 @@ mod test {
       .sonarr_data
       .blocklist
       .set_items(blocklist_items);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -546,6 +551,7 @@ mod test {
       .sonarr_data
       .blocklist
       .set_items(vec![blocklist_item()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -570,6 +576,7 @@ mod test {
     .await;
     app_arc.lock().await.data.sonarr_data.season_details_modal =
       Some(SeasonDetailsModal::default());
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -599,6 +606,7 @@ mod test {
       .sonarr_data
       .downloads
       .set_items(vec![download_record()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -628,6 +636,7 @@ mod test {
       .sonarr_data
       .indexers
       .set_items(vec![indexer()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -650,6 +659,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -677,6 +687,7 @@ mod test {
       Some("deleteFiles=true&addImportExclusion=true"),
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -699,6 +710,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -731,6 +743,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -761,6 +774,7 @@ mod test {
     )
     .await;
 
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -858,6 +872,7 @@ mod test {
       .await;
     app_arc.lock().await.data.sonarr_data.tags_map =
       BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -955,6 +970,7 @@ mod test {
       .match_body(Matcher::Json(expected_indexer_edit_body_json))
       .create_async()
       .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -1047,6 +1063,7 @@ mod test {
       .await;
     app_arc.lock().await.data.sonarr_data.tags_map =
       BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -1146,6 +1163,7 @@ mod test {
       .await;
     app_arc.lock().await.data.sonarr_data.tags_map =
       BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -1210,6 +1228,7 @@ mod test {
       .match_body(Matcher::Json(indexer_details_json))
       .create_async()
       .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -1299,6 +1318,7 @@ mod test {
       .match_body(Matcher::Json(expected_edit_indexer_body))
       .create_async()
       .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -1358,6 +1378,7 @@ mod test {
       .await;
     app_arc.lock().await.data.sonarr_data.tags_map =
       BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -1418,6 +1439,7 @@ mod test {
       .await;
     app_arc.lock().await.data.sonarr_data.tags_map =
       BiMap::from_iter([(1, "usenet".to_owned()), (2, "testing".to_owned())]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -1460,6 +1482,7 @@ mod test {
       .match_body(Matcher::Json(expected_body))
       .create_async()
       .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -1505,6 +1528,7 @@ mod test {
       .match_body(Matcher::Json(expected_body))
       .create_async()
       .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -1603,6 +1627,7 @@ mod test {
         .blocklist
         .sorting(vec![blocklist_sort_option]);
     }
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::BlocklistResponse(blocklist) = network
@@ -1678,6 +1703,7 @@ mod test {
       .sonarr_data
       .blocklist
       .sorting(vec![blocklist_sort_option]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::BlocklistResponse(blocklist) = network
@@ -1719,6 +1745,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::DownloadsResponse(downloads) = network
@@ -1756,6 +1783,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
     let disk_space_vec = vec![
       DiskSpace {
@@ -1794,6 +1822,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     let _ = network.handle_sonarr_event(SonarrEvent::HealthCheck).await;
@@ -1873,6 +1902,7 @@ mod test {
         season_number: 1,
         ..Season::default()
       }]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Episodes(episodes) = network
@@ -1959,6 +1989,7 @@ mod test {
         id: 1,
         ..Series::default()
       }]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Episodes(episodes) = network
@@ -2018,6 +2049,7 @@ mod test {
         id: 1,
         ..Series::default()
       }]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Episodes(episodes) = network
@@ -2122,6 +2154,7 @@ mod test {
         ..Series::default()
       }]);
     app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Episodes(episodes) = network
@@ -2180,6 +2213,7 @@ mod test {
         id: 1,
         ..Series::default()
       }]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::EpisodeFiles(episode_files) = network
@@ -2227,6 +2261,7 @@ mod test {
         id: 1,
         ..Series::default()
       }]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::EpisodeFiles(episode_files) = network
@@ -2283,6 +2318,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::HostConfig(host_config) = network
@@ -2371,6 +2407,7 @@ mod test {
         .history
         .sorting(vec![history_sort_option]);
     }
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
@@ -2449,6 +2486,7 @@ mod test {
       .sonarr_data
       .history
       .sorting(vec![history_sort_option]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
@@ -2506,6 +2544,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Indexers(indexers) = network
@@ -2545,6 +2584,7 @@ mod test {
       .lock()
       .await
       .push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into());
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Episode(episode) = network
@@ -2658,6 +2698,7 @@ mod test {
       .lock()
       .await
       .push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into());
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Episode(episode) = network
@@ -2822,6 +2863,7 @@ mod test {
       .unwrap()
       .episode_history
       .sort_asc = true;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
@@ -2930,6 +2972,7 @@ mod test {
       .unwrap()
       .episodes
       .set_items(vec![episode()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
@@ -3026,6 +3069,7 @@ mod test {
       Some("episodeId=1&pageSize=1000&sortDirection=descending&sortKey=date"),
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryWrapper(history) = network
@@ -3083,6 +3127,7 @@ mod test {
     )
     .await;
     app_arc.lock().await.cli_mode = true;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Episode(episode) = network
@@ -3109,6 +3154,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     network
@@ -3134,6 +3180,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::LanguageProfiles(language_profiles) = network
@@ -3193,6 +3240,7 @@ mod test {
       Some("pageSize=500&sortDirection=descending&sortKey=time"),
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::LogResponse(logs) = network
@@ -3236,6 +3284,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::QualityProfiles(quality_profiles) = network
@@ -3287,6 +3336,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::QueueEvents(events) = network
@@ -3322,6 +3372,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::RootFolders(root_folders) = network
@@ -3377,6 +3428,7 @@ mod test {
       .as_mut()
       .unwrap()
       .episode_details_modal = Some(EpisodeDetailsModal::default());
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Releases(releases_vec) = network
@@ -3435,6 +3487,7 @@ mod test {
     let mut season_details_modal = SeasonDetailsModal::default();
     season_details_modal.episodes.set_items(vec![episode()]);
     app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Releases(releases_vec) = network
@@ -3542,6 +3595,7 @@ mod test {
       .unwrap()
       .season_history
       .sort_asc = true;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryItems(history) = network
@@ -3646,6 +3700,7 @@ mod test {
       .sonarr_data
       .seasons
       .set_items(vec![season()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryItems(history) = network
@@ -3765,6 +3820,7 @@ mod test {
       .set_items(vec![season()]);
     app_arc.lock().await.data.sonarr_data.season_details_modal =
       Some(SeasonDetailsModal::default());
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Releases(releases_vec) = network
@@ -3853,6 +3909,7 @@ mod test {
       .sonarr_data
       .seasons
       .set_items(vec![season()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -3940,6 +3997,7 @@ mod test {
         .series
         .sorting(vec![title_sort_option]);
     }
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SeriesVec(series) = network
@@ -3977,6 +4035,7 @@ mod test {
       .sonarr_data
       .series
       .set_items(vec![series()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Series(series) = network
@@ -4072,6 +4131,7 @@ mod test {
       .series
       .set_items(vec![series()]);
     app_arc.lock().await.data.sonarr_data.series_history = Some(series_history_table);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
@@ -4174,6 +4234,7 @@ mod test {
       .sonarr_data
       .series
       .set_items(vec![series()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
@@ -4282,6 +4343,7 @@ mod test {
       .lock()
       .await
       .push_navigation_stack(ActiveSonarrBlock::SeriesHistorySortPrompt.into());
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
@@ -4361,6 +4423,7 @@ mod test {
       .sonarr_data
       .series
       .sorting(vec![title_sort_option]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -4402,6 +4465,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SecurityConfig(security_config) = network
@@ -4429,6 +4493,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
     let date_time = DateTime::from(DateTime::parse_from_rfc3339("2023-02-25T20:16:43Z").unwrap());
 
@@ -4467,6 +4532,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Tags(tags) = network
@@ -4527,6 +4593,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Tasks(tasks) = network
@@ -4622,6 +4689,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Updates(updates) = network
@@ -4651,6 +4719,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -4688,6 +4757,7 @@ mod test {
     )
     .await;
     app_arc.lock().await.data.sonarr_data.add_series_search = Some("test term".into());
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::AddSeriesSearchResults(add_series_search_results) = network
@@ -4732,6 +4802,7 @@ mod test {
     )
     .await;
     app_arc.lock().await.data.sonarr_data.add_series_search = Some("test term".into());
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -4778,6 +4849,7 @@ mod test {
         task_name: SonarrTaskName::default(),
         ..SonarrTask::default()
       }]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Value(value) = network
@@ -4851,6 +4923,7 @@ mod test {
       .sonarr_data
       .indexers
       .set_items(vec![indexer()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Value(value) = network
@@ -4920,6 +4993,7 @@ mod test {
       .sonarr_data
       .indexers
       .set_items(vec![indexer()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Value(value) = network
@@ -5003,6 +5077,7 @@ mod test {
       .sonarr_data
       .indexers
       .set_items(indexers);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::IndexerTestResults(results) = network
@@ -5066,6 +5141,7 @@ mod test {
       .match_body(Matcher::Json(json!(expected_body)))
       .create_async()
       .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -5120,6 +5196,7 @@ mod test {
       app.data.sonarr_data.series.set_items(vec![series()]);
       app.data.sonarr_data.seasons.set_items(vec![season()]);
     }
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -5146,6 +5223,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -5172,6 +5250,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -5197,6 +5276,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -5221,6 +5301,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -5253,6 +5334,7 @@ mod test {
       .sonarr_data
       .series
       .set_items(vec![series()]);
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -5277,6 +5359,7 @@ mod test {
       None,
     )
     .await;
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
@@ -5289,7 +5372,7 @@ mod test {
 
   #[tokio::test]
   async fn test_extract_and_add_sonarr_tag_ids_vec() {
-    let app_arc = Arc::new(Mutex::new(App::default()));
+    let app_arc = Arc::new(Mutex::new(App::test_default()));
     let tags = "    test,HI ,, usenet ";
     {
       let mut app = app_arc.lock().await;
@@ -5299,6 +5382,7 @@ mod test {
         (3, "hi".to_owned()),
       ]);
     }
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert_eq!(
@@ -5329,6 +5413,7 @@ mod test {
       app.data.sonarr_data.tags_map =
         BiMap::from_iter([(1, "usenet".to_owned()), (2, "test".to_owned())]);
     }
+    app_arc.lock().await.server_tabs.next();
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     let tag_ids_vec = network.extract_and_add_sonarr_tag_ids_vec(tags).await;