diff --git a/src/cpl_cli/live_server/live_server_service.py b/src/cpl_cli/live_server/live_server_service.py
index fc0ddcce..9e052805 100644
--- a/src/cpl_cli/live_server/live_server_service.py
+++ b/src/cpl_cli/live_server/live_server_service.py
@@ -48,7 +48,7 @@ class LiveServerService(ServiceABC, FileSystemEventHandler):
         for proc in psutil.process_iter():
             with suppress(Exception):
                 if proc.cmdline() == self._ls_thread.command:
-                    os.system(f'pkill -f {self._ls_thread.main}')
+                    proc.kill()
 
         Console.write_line('Restart\n')
         while self._ls_thread.is_alive():
diff --git a/src/tests/custom/cpl-test/src/model/test_model.py b/src/tests/custom/cpl-test/src/model/test_model.py
index 63f50640..86fecae0 100644
--- a/src/tests/custom/cpl-test/src/model/test_model.py
+++ b/src/tests/custom/cpl-test/src/model/test_model.py
@@ -6,7 +6,7 @@ from cpl.console import Console
 class TestModel:
 
     def __init__(self):
-        Console.spinner('Waiting: ', self._wait, 3)
+        Console.spinner('Waiting: ', self._wait, 10)
         option = Console.select('->', 'Select option: ', [
             'Option 1',
             'Option 2',