diff --git a/ls.nim b/ls.nim
index 84cac79..46de73f 100644
--- a/ls.nim
+++ b/ls.nim
@@ -627,7 +627,7 @@ proc createOrRestartNimsuggest*(ls: LanguageServer, projectFile: string, uri = "
                         MessageType.Error)
         ls.sendStatusChanged()
 
-
+      #TODO instead of waiting here, this whole function should be async. 
       projectNext = waitFor createNimsuggest(projectFile, nimsuggestPath, version,
                                       timeout, restartCallback, errorCallback, workingDir, configuration.logNimsuggest.get(false),
                                       configuration.exceptionHintsEnabled)
diff --git a/tests/textensions.nim b/tests/textensions.nim
index 9ce486a..d7f0c10 100644
--- a/tests/textensions.nim
+++ b/tests/textensions.nim
@@ -51,10 +51,10 @@ suite "Nimlangserver":
     client.notify("textDocument/didOpen",
                   %createDidOpenParams("projects/hw/useRoot.nim"))
     
-    let prevSuggestPid = ls.projectFiles[hwAbsFile].ns.waitFor.process.pid
+    let prevSuggestPid = ls.projectFiles[hwAbsFile].process.pid
     let suggestParams = SuggestParams(action: saRestart, projectFile: hwAbsFile)
     let suggestRes = client.call("extension/suggest", %suggestParams).waitFor
-    let suggestPid = ls.projectFiles[hwAbsFile].ns.waitFor.process.pid
+    let suggestPid = ls.projectFiles[hwAbsFile].process.pid
 
     check prevSuggestPid != suggestPid
     
diff --git a/tests/tsuggestapi.nim b/tests/tsuggestapi.nim
index 0c0545c..6bc1f8c 100644
--- a/tests/tsuggestapi.nim
+++ b/tests/tsuggestapi.nim
@@ -7,7 +7,7 @@ const inputLineWithEndLine = "outline	skEnumField	system.bool.true	bool	basic_ty
 suite "Nimsuggest tests":
   let
     helloWorldFile = getCurrentDir() / "tests/projects/hw/hw.nim"
-    nimSuggest = createNimsuggest(helloWorldFile).waitFor
+    nimSuggest = createNimsuggest(helloWorldFile).waitFor.ns.waitFor
 
   test "Parsing qualified path":
     doAssert parseQualifiedPath("a.b.c") == @["a", "b", "c"]