diff --git a/Cargo.lock b/Cargo.lock
index 67c6b4931..27a776477 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2978,6 +2978,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "dotenv",
+ "envy",
  "make_option",
  "monitor_client",
  "monitor_types",
diff --git a/bin/tests/Cargo.toml b/bin/tests/Cargo.toml
index 4fd571f3f..6e399348d 100644
--- a/bin/tests/Cargo.toml
+++ b/bin/tests/Cargo.toml
@@ -16,4 +16,5 @@ serde_json.workspace = true
 partial_derive2.workspace = true
 make_option.workspace = true
 mungos.workspace = true
-dotenv.workspace = true
\ No newline at end of file
+dotenv.workspace = true
+envy.workspace = true
\ No newline at end of file
diff --git a/bin/tests/src/core.rs b/bin/tests/src/core.rs
index 0e36354c7..c217abc27 100644
--- a/bin/tests/src/core.rs
+++ b/bin/tests/src/core.rs
@@ -7,17 +7,26 @@ use monitor_types::{
     },
     requests::{execute, read, write},
 };
+use serde::Deserialize;
 
 #[allow(unused)]
 pub async fn tests() -> anyhow::Result<()> {
     dotenv::dotenv().ok();
 
+    // create_secret().await?;
+
     let monitor = MonitorClient::new_from_env().await?;
 
-    let mut builds = monitor.read(read::ListBuilds { query: None }).await?;
-    let build_id = builds.pop().unwrap().id;
+    // create_server(&monitor).await?;
 
-    run_build(&monitor, build_id).await?;
+    let mut servers = monitor.read(read::ListServers { query: None }).await?;
+    // let server_id = servers.pop().unwrap().id;
+    // let server = monitor.read(read::GetServer { id: server_id }).await?;
+    println!("{servers:#?}");
+
+    // let mut builds = monitor.read(read::ListBuilds { query: None }).await?;
+    // let build_id = builds.pop().unwrap().id;
+    // run_build(&monitor, build_id).await?;
 
     Ok(())
 }
@@ -85,7 +94,7 @@ async fn create_repo(monitor: &MonitorClient) -> anyhow::Result<()> {
 async fn create_server(monitor: &MonitorClient) -> anyhow::Result<()> {
     let res = monitor
         .write(write::CreateServer {
-            name: String::from("max-apt"),
+            name: String::from("mogh-server"),
             config: PartialServerConfig {
                 address: "http://localhost:8001".to_string().into(),
                 ..Default::default()
@@ -98,11 +107,23 @@ async fn create_server(monitor: &MonitorClient) -> anyhow::Result<()> {
     Ok(())
 }
 
+#[derive(Deserialize)]
+struct CreateSecretEnv {
+    monitor_address: String,
+    monitor_username: String,
+    monitor_password: String,
+}
+
 #[allow(unused)]
 async fn create_secret() -> anyhow::Result<()> {
-    let monitor =
-        MonitorClient::new_with_new_account("http://localhost:9001", "defi moses", "jah guide")
-            .await?;
+    let env: CreateSecretEnv = envy::from_env()?;
+
+    let monitor = MonitorClient::new_with_new_account(
+        env.monitor_address,
+        env.monitor_username,
+        env.monitor_password,
+    )
+    .await?;
 
     let secret = monitor
         .write(write::CreateLoginSecret {