diff --git a/.gitignore b/.gitignore
index bf962da..3f812e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 out
 node_modules
-client/server
+client/tsconfig.tsbuildinfo
 .vscode-test
\ No newline at end of file
diff --git a/README.md b/README.md
index ee3baac..7749d94 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,13 @@
 
 This vscode extension is in development and might be lacking features you know working from `vscode-elm`.
 
-You will need to install `elm` and `elm-format`, to get all diagnostics. If your setup fails to find the global installations of those, you can use the settings panel is VSCode to set the paths to the executables manually.
+You will need to install `elm`, `elm-test` and `elm-format`, to get all diagnostics. If your setup fails to find the global installations of those, you can use the settings panel is VSCode to set the paths to the executables manually.
+
+```shell
+npm install -g elm
+npm install -g elm-test
+npm install -g elm-format
+```
 
 ## Features
 
@@ -27,3 +33,4 @@ This extension contributes the following settings:
 - `elmLS.trace.server`: Enable/disable trace logging of client and server communication
 - `elmLS.elmPath`: The path to your elm executable.
 - `elmLS.elmFormatPath`: The path to your elm-format executable.
+- `elmLS.elmTestPath`: The path to your elm-test executable.
diff --git a/client/tsconfig.json b/client/tsconfig.json
index 15a993d..53a81c2 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,20 +1,14 @@
 {
-	"compilerOptions": {
-		"module": "commonjs",
-		"target": "es6",
-		"outDir": "out",
-		"strict": true,
-		"rootDir": "src",
-		"lib": [
-			"es6"
-		],
-		"sourceMap": true
-	},
-	"include": [
-		"src"
-	],
-	"exclude": [
-		"node_modules",
-		".vscode-test"
-	]
-}
\ No newline at end of file
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "outDir": "out",
+    "strict": true,
+    "rootDir": "src",
+    "lib": ["es6"],
+    "sourceMap": true,
+    "composite": true
+  },
+  "include": ["src"],
+  "exclude": ["node_modules", ".vscode-test"]
+}
diff --git a/package-lock.json b/package-lock.json
index 57f7c41..6836200 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,15 +25,15 @@
 			}
 		},
 		"@types/mocha": {
-			"version": "5.2.6",
-			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.6.tgz",
-			"integrity": "sha512-1axi39YdtBI7z957vdqXI4Ac25e7YihYQtJa+Clnxg1zTJEaIRbndt71O3sP4GAMgiAm0pY26/b9BrY4MR/PMw==",
+			"version": "5.2.7",
+			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz",
+			"integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
 			"dev": true
 		},
 		"@types/node": {
-			"version": "12.0.2",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.2.tgz",
-			"integrity": "sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==",
+			"version": "12.0.4",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.4.tgz",
+			"integrity": "sha512-j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw==",
 			"dev": true
 		},
 		"ansi-styles": {
@@ -161,9 +161,9 @@
 			"dev": true
 		},
 		"glob": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+			"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
 			"dev": true,
 			"requires": {
 				"fs.realpath": "^1.0.0",
@@ -282,9 +282,9 @@
 			"dev": true
 		},
 		"resolve": {
-			"version": "1.10.1",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz",
-			"integrity": "sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+			"integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
 			"dev": true,
 			"requires": {
 				"path-parse": "^1.0.6"
@@ -318,9 +318,9 @@
 			"dev": true
 		},
 		"tslint": {
-			"version": "5.16.0",
-			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.16.0.tgz",
-			"integrity": "sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==",
+			"version": "5.17.0",
+			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.17.0.tgz",
+			"integrity": "sha512-pflx87WfVoYepTet3xLfDOLDm9Jqi61UXIKePOuca0qoAZyrGWonDG9VTbji58Fy+8gciUn8Bt7y69+KEVjc/w==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.0.0",
@@ -329,7 +329,7 @@
 				"commander": "^2.12.1",
 				"diff": "^3.2.0",
 				"glob": "^7.1.1",
-				"js-yaml": "^3.13.0",
+				"js-yaml": "^3.13.1",
 				"minimatch": "^3.0.4",
 				"mkdirp": "^0.5.1",
 				"resolve": "^1.3.2",
@@ -374,9 +374,9 @@
 			}
 		},
 		"typescript": {
-			"version": "3.4.5",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz",
-			"integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==",
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.1.tgz",
+			"integrity": "sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==",
 			"dev": true
 		},
 		"wrappy": {
diff --git a/package.json b/package.json
index 5c5887f..5f71f7e 100644
--- a/package.json
+++ b/package.json
@@ -93,6 +93,12 @@
           "type": "string",
           "default": "elm-format",
           "description": "The path to your elm-format executeable."
+        },
+        "elmLS.elmTestPath": {
+          "scope": "window",
+          "type": "string",
+          "default": "elm-test",
+          "description": "The path to your elm-test executeable."
         }
       }
     }
@@ -107,13 +113,13 @@
     "tslint-check": "tslint-config-prettier-check ./tslint.json"
   },
   "devDependencies": {
-    "@types/mocha": "^5.2.6",
-    "@types/node": "^12.0.2",
+    "@types/mocha": "^5.2.7",
+    "@types/node": "^12.0.4",
     "prettier": "^1.17.1",
-    "tslint": "^5.16.0",
+    "tslint": "^5.17.0",
     "tslint-config-prettier": "^1.18.0",
     "tslint-plugin-prettier": "^2.0.1",
     "tslint-sonarts": "^1.9.0",
-    "typescript": "3.4.5"
+    "typescript": "3.5.1"
   }
 }
diff --git a/server b/server
index ba4e803..f437588 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit ba4e803d251419b5c3f041d6739167e567d34e64
+Subproject commit f437588542f929356d3e69a121e9b880889c22aa