diff --git a/Cargo.lock b/Cargo.lock
index 30bbb77d..c676027b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2678,6 +2678,7 @@ dependencies = [
  "tracing-appender",
  "tracing-subscriber",
  "uds_windows",
+ "uuid",
  "which",
  "win32-display-data",
  "windows 0.60.0",
@@ -5546,6 +5547,15 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
+[[package]]
+name = "uuid"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
+dependencies = [
+ "getrandom 0.3.1",
+]
+
 [[package]]
 name = "v_frame"
 version = "0.3.8"
diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml
index 1d814cce..54c002d4 100644
--- a/komorebi/Cargo.toml
+++ b/komorebi/Cargo.toml
@@ -55,6 +55,7 @@ shadow-rs = { workspace = true }
 
 [dev-dependencies]
 reqwest = { version = "0.12", features = ["blocking"] }
+uuid = { version = "1", features = ["v4"] }
 
 [features]
 default = ["schemars"]
diff --git a/komorebi/src/main.rs b/komorebi/src/main.rs
index a76d97f9..40a8569b 100644
--- a/komorebi/src/main.rs
+++ b/komorebi/src/main.rs
@@ -235,6 +235,7 @@ fn main() -> Result<()> {
     } else {
         Arc::new(Mutex::new(WindowManager::new(
             winevent_listener::event_rx(),
+            None,
         )?))
     };
 
diff --git a/komorebi/src/window_manager.rs b/komorebi/src/window_manager.rs
index fce739fb..6d53273a 100644
--- a/komorebi/src/window_manager.rs
+++ b/komorebi/src/window_manager.rs
@@ -398,8 +398,11 @@ impl EnforceWorkspaceRuleOp {
 
 impl WindowManager {
     #[tracing::instrument]
-    pub fn new(incoming: Receiver<WindowManagerEvent>) -> Result<Self> {
-        let socket = DATA_DIR.join("komorebi.sock");
+    pub fn new(
+        incoming: Receiver<WindowManagerEvent>,
+        custom_socket_path: Option<PathBuf>,
+    ) -> Result<Self> {
+        let socket = custom_socket_path.unwrap_or_else(|| DATA_DIR.join("komorebi.sock"));
 
         match std::fs::remove_file(&socket) {
             Ok(()) => {}
diff --git a/komorebi/tests/window_manager.rs b/komorebi/tests/window_manager.rs
new file mode 100644
index 00000000..887d6894
--- /dev/null
+++ b/komorebi/tests/window_manager.rs
@@ -0,0 +1,86 @@
+#[cfg(test)]
+mod window_manager_tests {
+    use color_eyre::eyre::anyhow;
+    use crossbeam_channel::bounded;
+    use crossbeam_channel::Receiver;
+    use crossbeam_channel::Sender;
+    use komorebi::monitor;
+    use komorebi::window_manager::WindowManager;
+    use komorebi::Rect;
+    use komorebi::WindowManagerEvent;
+    use komorebi::DATA_DIR;
+    use uuid::Uuid;
+
+    #[test]
+    fn test_create_window_manager() {
+        let (_sender, receiver): (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) =
+            bounded(1);
+        let socket_name = format!("komorebi-test-{}.sock", Uuid::new_v4());
+        let socket = Some(DATA_DIR.join(socket_name));
+        let wm = WindowManager::new(receiver, socket.clone());
+        assert!(wm.is_ok());
+
+        if let Some(ref socket_path) = socket {
+            let _ = std::fs::remove_file(socket_path);
+        }
+    }
+
+    #[test]
+    fn test_focus_workspace() {
+        let (_sender, receiver): (Sender<WindowManagerEvent>, Receiver<WindowManagerEvent>) =
+            bounded(1);
+        let socket_name = format!("komorebi-test-{}.sock", Uuid::new_v4());
+        let socket = Some(DATA_DIR.join(socket_name));
+        let mut wm = WindowManager::new(receiver, socket.clone()).unwrap();
+        let m = monitor::new(
+            0,
+            Rect::default(),
+            Rect::default(),
+            "TestMonitor".to_string(),
+            "TestDevice".to_string(),
+            "TestDeviceID".to_string(),
+            Some("TestMonitorID".to_string()),
+        );
+
+        wm.monitors.elements_mut().push_back(m);
+
+        let workspace_idx = {
+            let monitor = wm
+                .focused_monitor_mut()
+                .ok_or_else(|| anyhow!("there is no workspace"))
+                .unwrap();
+            monitor.new_workspace_idx()
+        };
+
+        {
+            let monitor = wm
+                .focused_monitor_mut()
+                .ok_or_else(|| anyhow!("there is no workspace"))
+                .unwrap();
+            monitor
+                .focus_workspace(workspace_idx)
+                .expect("failed to focus workspace");
+        }
+
+        {
+            let monitor = wm
+                .focused_monitor_mut()
+                .ok_or_else(|| anyhow!("there is no workspace"))
+                .unwrap();
+            monitor
+                .focus_workspace(workspace_idx + 1)
+                .expect("failed to focus workspace");
+            assert_eq!(monitor.workspaces().len(), 3)
+        }
+
+        assert_eq!(wm.focused_workspace_idx().unwrap(), 2);
+
+        wm.focus_workspace(0).ok();
+
+        assert_eq!(wm.focused_workspace_idx().unwrap(), 0);
+
+        if let Some(ref socket_path) = socket {
+            let _ = std::fs::remove_file(socket_path);
+        }
+    }
+}