diff --git a/src/helper/develop.rs b/src/helper/develop.rs
index 926bddf7..eccdca4e 100644
--- a/src/helper/develop.rs
+++ b/src/helper/develop.rs
@@ -1,67 +1,302 @@
+use std::collections::HashMap;
+
 use crate::cli;
 use crate::helper;
-use anyhow::Result;
-use core::time::Duration;
-use std::thread;
+use anyhow::{anyhow, Result};
 use thirtyfour::prelude::*;
+use tokio::process::Command;
 use tokio::runtime::Runtime;
+use tokio::sync::RwLock;
 use tracing::*;
 
-async fn task(mut counter: i32) -> Result<()> {
-    info!("Started webrtc test..");
+pub struct ChromeWebDriver {
+    _process: tokio::task::JoinHandle<()>,
+    webdriver: WebDriver,
+}
+
+impl Drop for ChromeWebDriver {
+    fn drop(&mut self) {
+        self._process.abort();
+    }
+}
+
+impl std::ops::Deref for ChromeWebDriver {
+    type Target = WebDriver;
+
+    fn deref(&self) -> &Self::Target {
+        &self.webdriver
+    }
+}
+
+impl ChromeWebDriver {
+    #[instrument]
+    pub async fn new() -> Result<Self> {
+        let port = cli::manager::enable_webrtc_task_test().unwrap();
 
-    let mut caps = DesiredCapabilities::chrome();
-    let _ = caps.set_headless();
+        let _process = tokio::spawn(async move {
+            let res = Command::new("chromedriver")
+                .args([
+                    format!("--port={port}").as_str(),
+                    "--allow-running-insecure-content",
+                    "--autoplay-policy=user-gesture-required",
+                    "--disable-add-to-shelf",
+                    "--disable-background-networking",
+                    "--disable-background-timer-throttling",
+                    "--disable-backgrounding-occluded-windows",
+                    "--disable-breakpad",
+                    "--disable-checker-imaging",
+                    "--disable-client-side-phishing-detection",
+                    "--disable-component-extensions-with-background-pages",
+                    "--disable-datasaver-prompt",
+                    "--disable-default-apps",
+                    "--disable-desktop-notifications",
+                    "--disable-dev-shm-usage",
+                    "--disable-domain-reliability",
+                    "--disable-extensions",
+                    "--disable-features=TranslateUI,BlinkGenPropertyTrees",
+                    "--disable-hang-monitor",
+                    "--disable-infobars",
+                    "--disable-ipc-flooding-protection",
+                    "--disable-notifications",
+                    "--disable-popup-blocking",
+                    "--disable-prompt-on-repost",
+                    "--disable-renderer-backgrounding",
+                    "--disable-setuid-sandbox",
+                    "--disable-site-isolation-trials",
+                    "--disable-sync",
+                    "--disable-web-security",
+                    "--enable-automation",
+                    "--force-color-profile=srgb",
+                    "--force-device-scale-factor=1",
+                    "--ignore-certificate-errors",
+                    "--js-flags=--random-seed=1157259157",
+                    "--disable-logging",
+                    "--metrics-recording-only",
+                    "--mute-audio",
+                    "--no-default-browser-check",
+                    "--no-first-run",
+                    "--no-sandbox",
+                    "--password-store=basic",
+                    "--test-type",
+                    "--use-mock-keychain",
+                ])
+                // .env("DISPLAY", ":99")
+                .kill_on_drop(true)
+                .spawn()
+                .unwrap()
+                .wait_with_output()
+                .await;
 
-    let port = cli::manager::enable_webrtc_task_test().unwrap();
-    let driver = WebDriver::new(&format!("http://localhost:{}", port), caps)
-        .await
-        .unwrap_or_else(|_| {
-            error!("Failed to connect with WebDriver.");
-            std::process::exit(-1)
+            debug!("ChromeDriver terminated with: {res:#?}");
         });
 
-    driver
-        .goto("http://0.0.0.0:6020/webrtc/index.html")
-        .await
-        .expect("Failed to connect to local webrtc page.");
-
-    loop {
-        for button in ["add-consumer", "add-session", "remove-all-consumers"] {
-            info!("Looking for element: {button}");
-            driver
-                .query(By::Id(button))
-                .wait(Duration::from_secs(60), Duration::from_millis(100))
-                .first()
-                .await?
-                .click()
-                .await?;
+        tokio::time::sleep(tokio::time::Duration::from_secs(3)).await;
+
+        let mut caps = DesiredCapabilities::chrome();
+        caps.set_headless().unwrap();
+        caps.set_no_sandbox().unwrap(); // Bypass OS security model
+        caps.set_disable_dev_shm_usage().unwrap(); // overcome limited resource problems
+        caps.set_disable_web_security().unwrap();
+        caps.set_ignore_certificate_errors().unwrap();
+
+        let webdriver = WebDriver::new(&format!("http://127.0.0.1:{port}"), caps)
+            .await
+            .unwrap();
+
+        Ok(Self {
+            _process,
+            webdriver,
+        })
+    }
+}
+
+#[instrument]
+async fn prepare() -> Result<ChromeWebDriver> {
+    let webdriver = ChromeWebDriver::new().await.unwrap();
+
+    let frontend_address = cli::manager::server_address();
+    let webrtc_frontend_url = format!("http://{frontend_address}/webrtc/index.html");
+
+    while let Err(error) = webdriver.goto(&webrtc_frontend_url).await {
+        error!("Failed to connect: {error}");
+        tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
+    }
+
+    // Wait for the system to stabilize
+    tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+
+    Ok(webdriver)
+}
+
+fn get_difference_map<K, V>(map1: &HashMap<K, V>, map2: &HashMap<K, V>) -> HashMap<K, V>
+where
+    K: std::hash::Hash + Eq + Copy,
+    V: Clone,
+{
+    map1.iter()
+        .filter(|(k, _)| !map2.contains_key(k))
+        .map(|(k, v)| (*k, v.clone()))
+        .collect()
+}
+
+fn has_common_entries<K, V>(map1: &HashMap<K, V>, map2: &HashMap<K, V>) -> bool
+where
+    K: std::hash::Hash + Eq,
+    V: PartialEq,
+{
+    map2.iter()
+        .any(|(key, value)| map1.get(key).map_or(false, |v| v == value))
+}
+
+#[instrument]
+async fn task(session_cycles: i32) -> Result<()> {
+    let webdriver = prepare().await?;
+
+    // Configurations
+    let sessions_per_consumer = 5;
+
+    // Start of test
+    let initial_tasks = helper::threads::process_tasks();
+    let tasks_last_cycle = RwLock::new(initial_tasks.clone());
+    let current_tasks = RwLock::new(HashMap::default());
+    let new_tasks_since_start = RwLock::new(HashMap::default());
+    let new_tasks_since_last_cycle = RwLock::new(HashMap::default());
+    let tasks_alive_from_last_cycle = RwLock::new(HashMap::default());
+
+    info!(
+        "Started webrtc test. Number of tasks: {}",
+        initial_tasks.len()
+    );
+
+    for current_cycle in 0..=session_cycles {
+        let add_consumer_button = webdriver.query(By::Id("add-consumer")).first().await?;
+        add_consumer_button.click().await?;
+
+        // Add all sessions
+        let add_session_button = webdriver.query(By::Id("add-session")).first().await?;
+        for _ in 0..sessions_per_consumer {
+            add_session_button.click().await?;
+            tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
         }
 
-        counter += 1;
+        // Wait for all statuses be "Playing"
+        tokio::time::timeout(tokio::time::Duration::from_secs(30), {
+            async {
+                loop {
+                    let elements = match webdriver
+                        .webdriver
+                        .query(By::Id("session-status"))
+                        .with_text("Status: Playing")
+                        .all_from_selector()
+                        .await
+                    {
+                        Ok(elements) => elements,
+                        Err(error) => break Err(error),
+                    };
 
-        info!("Restarted webrtc {} times", counter);
-        let number_of_tasks = helper::threads::process_task_counter();
-        if number_of_tasks > 100 {
-            error!("Thead leak detected: {number_of_tasks}");
-            std::process::exit(-1);
+                    if elements.len().eq(&sessions_per_consumer) {
+                        break Ok(());
+                    }
+
+                    tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
+                }
+            }
+        })
+        .await??;
+
+        info!("All sessions are Playing");
+
+        // Remove consumer, also removing all sessions
+        let remove_consumer_button = webdriver.query(By::Id("remove-consumer")).first().await?;
+        remove_consumer_button.click().await?;
+
+        info!("Consumer removed, waiting for tasks to finish...");
+
+        tasks_alive_from_last_cycle
+            .write()
+            .await
+            .clone_from(&*new_tasks_since_last_cycle.read().await);
+
+        // Wait for tasks to die
+        let wait_for_tasks_to_die = async {
+            let mut current_task = current_tasks.write().await;
+            let mut new_tasks_since_start = new_tasks_since_start.write().await;
+            let mut new_tasks_since_last_cycle = new_tasks_since_last_cycle.write().await;
+            let tasks_last_cycle = tasks_last_cycle.read().await;
+            let tasks_alive_from_last_cycle = tasks_alive_from_last_cycle.read().await;
+
+            loop {
+                *current_task = helper::threads::process_tasks();
+                *new_tasks_since_start = get_difference_map(&current_task, &initial_tasks);
+                *new_tasks_since_last_cycle = get_difference_map(&current_task, &tasks_last_cycle);
+
+                let all_tasks_alive_from_last_cycle_are_dead =
+                    has_common_entries(&current_task, &tasks_alive_from_last_cycle);
+
+                let no_key_tasks_leaked_since_last_cycle =
+                    !new_tasks_since_last_cycle.values().any(|task_name| {
+                        let task_name = task_name.to_lowercase();
+
+                        task_name.starts_with("webrtcbin")
+                            || task_name.starts_with("nicesrc")
+                            || task_name.starts_with("rtpsession")
+                    });
+
+                if no_key_tasks_leaked_since_last_cycle && all_tasks_alive_from_last_cycle_are_dead
+                {
+                    break;
+                }
+
+                tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
+            }
+        };
+
+        if tokio::time::timeout(tokio::time::Duration::from_secs(30), wait_for_tasks_to_die)
+            .await
+            .is_err()
+        {
+            // Ignore first cycle
+            if current_cycle > 0 {
+                return Err(anyhow!(
+                "Thread leak detected on cycle {current_cycle}:\n{new_tasks_since_last_cycle:#?}\n{tasks_alive_from_last_cycle:#?}"
+            ));
+            }
+        };
+
+        let number_of_tasks = current_tasks.read().await.len();
+        let number_of_new_tasks_since_start = new_tasks_since_start.read().await.len();
+        let number_of_new_tasks_since_last_cycle = new_tasks_since_last_cycle.read().await.len();
+        let number_of_tasks_alive_from_last_cycle = tasks_alive_from_last_cycle.read().await.len();
+
+        *tasks_last_cycle.write().await = helper::threads::process_tasks();
+
+        info!("Successful cycles: {current_cycle}/{session_cycles}");
+        info!("Current tasks: {number_of_tasks}");
+        info!("New tasks since start: {number_of_new_tasks_since_start}");
+        info!("New tasks since last cycle: {number_of_new_tasks_since_last_cycle}");
+        info!("Tasks alive since last cycle: {number_of_tasks_alive_from_last_cycle}");
+
+        if number_of_new_tasks_since_last_cycle > 0 || number_of_tasks_alive_from_last_cycle > 0 {
+            info!("The following tasks were created since last cycle:\n{new_tasks_since_last_cycle:#?}");
+            info!("The following tasks were alive since last cycle:\n{tasks_alive_from_last_cycle:#?}")
         }
     }
+
+    Ok(())
 }
 
+#[instrument]
 pub fn start_check_tasks_on_webrtc_reconnects() {
-    let counter = 0;
-    thread::spawn(move || {
+    std::thread::spawn(move || {
         let rt = Runtime::new().unwrap();
-        rt.block_on(async move {
-            loop {
-                if let Err(error) = task(counter).await {
-                    error!("WebRTC Checker Task failed: {error:#?}");
-                    std::process::exit(-1);
-                }
-            }
-        });
-        error!("Webrtc test failed internally.");
-        std::process::exit(-1);
+
+        info!("Starting WebRTC test...");
+        if let Err(error) = rt.block_on(task(5)) {
+            error!("WebRTC test failed: {error:?}");
+            std::process::exit(1);
+        }
+
+        info!("WebRTC test passed!");
+        std::process::exit(0);
     });
 }