diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerParams.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerParams.java
index 1207b2d01..99d088760 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerParams.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerParams.java
@@ -174,32 +174,30 @@ public class BootLanguageServerParams {
 		};
 	}
 
-	public static LSFactory<BootLanguageServerParams> createTestDefault() {
-		return (SimpleLanguageServer server) -> {
-			// Initialize project finders, project caches and project observers
-			CompositeJavaProjectFinder javaProjectFinder = new CompositeJavaProjectFinder();
-			MavenProjectCache mavenProjectCache = new MavenProjectCache(server, MavenCore.getDefault(), false, null, (uri, cpe) -> JavaDocProviders.createFor(cpe));
-			mavenProjectCache.setAlwaysFireEventOnFileChanged(true);
-			javaProjectFinder.addJavaProjectFinder(new MavenProjectFinder(mavenProjectCache));
+	public static BootLanguageServerParams createTestDefault(SimpleLanguageServer server) {
+		// Initialize project finders, project caches and project observers
+		CompositeJavaProjectFinder javaProjectFinder = new CompositeJavaProjectFinder();
+		MavenProjectCache mavenProjectCache = new MavenProjectCache(server, MavenCore.getDefault(), false, null, (uri, cpe) -> JavaDocProviders.createFor(cpe));
+		mavenProjectCache.setAlwaysFireEventOnFileChanged(true);
+		javaProjectFinder.addJavaProjectFinder(new MavenProjectFinder(mavenProjectCache));
 
-			GradleProjectCache gradleProjectCache = new GradleProjectCache(server, GradleCore.getDefault(), false, null, (uri, cpe) -> JavaDocProviders.createFor(cpe));
-			gradleProjectCache.setAlwaysFireEventOnFileChanged(true);
-			javaProjectFinder.addJavaProjectFinder(new GradleProjectFinder(gradleProjectCache));
+		GradleProjectCache gradleProjectCache = new GradleProjectCache(server, GradleCore.getDefault(), false, null, (uri, cpe) -> JavaDocProviders.createFor(cpe));
+		gradleProjectCache.setAlwaysFireEventOnFileChanged(true);
+		javaProjectFinder.addJavaProjectFinder(new GradleProjectFinder(gradleProjectCache));
 
-			CompositeProjectOvserver projectObserver = new CompositeProjectOvserver(Arrays.asList(mavenProjectCache, gradleProjectCache));
+		CompositeProjectOvserver projectObserver = new CompositeProjectOvserver(Arrays.asList(mavenProjectCache, gradleProjectCache));
 
-			DefaultSpringPropertyIndexProvider indexProvider = new DefaultSpringPropertyIndexProvider(javaProjectFinder, projectObserver);
-			indexProvider.setProgressService(server.getProgressService());
+		DefaultSpringPropertyIndexProvider indexProvider = new DefaultSpringPropertyIndexProvider(javaProjectFinder, projectObserver);
+		indexProvider.setProgressService(server.getProgressService());
 
-			return new BootLanguageServerParams(
-					javaProjectFinder.filter(BootProjectUtil::isBootProject),
-					projectObserver,
-					indexProvider,
-					(doc) -> SpringPropertyIndex.EMPTY_INDEX,
-					(IDocument doc) -> new TypeUtil(javaProjectFinder.find(new TextDocumentIdentifier(doc.getUri()))),
-					RunningAppProvider.NULL,
-					SpringLiveHoverWatchdog.DEFAULT_INTERVAL
-			);
-		};
+		return new BootLanguageServerParams(
+				javaProjectFinder.filter(BootProjectUtil::isBootProject),
+				projectObserver,
+				indexProvider,
+				(doc) -> SpringPropertyIndex.EMPTY_INDEX,
+				(IDocument doc) -> new TypeUtil(javaProjectFinder.find(new TextDocumentIdentifier(doc.getUri()))),
+				RunningAppProvider.NULL,
+				SpringLiveHoverWatchdog.DEFAULT_INTERVAL
+		);
 	}
 }
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/bootiful/HoverTestConf.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/bootiful/HoverTestConf.java
index d67645e38..fff4c60dd 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/bootiful/HoverTestConf.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/bootiful/HoverTestConf.java
@@ -32,7 +32,7 @@ public class HoverTestConf {
 	}
 
 	@Bean BootLanguageServerParams serverParams(SimpleLanguageServer server) {
-		BootLanguageServerParams testDefaults = BootLanguageServerParams.createTestDefault().create(server);
+		BootLanguageServerParams testDefaults = BootLanguageServerParams.createTestDefault(server);
 		return new BootLanguageServerParams(
 				indexHarness().getProjectFinder(),
 				testDefaults.projectObserver,
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/bootiful/SymbolProviderTestConf.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/bootiful/SymbolProviderTestConf.java
index c9b0f542f..0bef7fb42 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/bootiful/SymbolProviderTestConf.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/bootiful/SymbolProviderTestConf.java
@@ -28,7 +28,7 @@ import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness;
 	}
 
 	@Bean BootLanguageServerParams serverParams(SimpleLanguageServer server) {
-		return BootLanguageServerParams.createTestDefault().create(server);
+		return BootLanguageServerParams.createTestDefault(server);
 	}
 
 	@Bean SpringIndexer springIndexer(BootLanguageServerInitializer serverInit) {
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/CompilationUnitCacheTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/CompilationUnitCacheTest.java
index c55943174..ac9c7644d 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/CompilationUnitCacheTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/CompilationUnitCacheTest.java
@@ -82,7 +82,7 @@ public class CompilationUnitCacheTest {
 		}
 
 		@Bean BootLanguageServerParams serverParams(SimpleLanguageServer server, MockProjectObserver projectObserver) {
-			BootLanguageServerParams testDefaults = BootLanguageServerParams.createTestDefault().create(server);
+			BootLanguageServerParams testDefaults = BootLanguageServerParams.createTestDefault(server);
 			return new BootLanguageServerParams(
 					indexHarness().getProjectFinder(),
 					projectObserver,
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java
index 2af35ef3c..22fd6f9c0 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java
@@ -79,7 +79,7 @@ public class ValueCompletionTest {
 		}
 
 		@Bean BootLanguageServerParams serverParams(SimpleLanguageServer server, JavaProjectFinder projectFinder) {
-			BootLanguageServerParams testDefaults = BootLanguageServerParams.createTestDefault().create(server);
+			BootLanguageServerParams testDefaults = BootLanguageServerParams.createTestDefault(server);
 			return new BootLanguageServerParams(
 					projectFinder,
 					ProjectObserver.NULL,