diff --git a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYamlEditorTest.java b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYamlEditorTest.java
index f25187a38..f9434080a 100644
--- a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYamlEditorTest.java
+++ b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/yaml/ManifestYamlEditorTest.java
@@ -11,6 +11,7 @@
 package org.springframework.ide.vscode.yaml;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.ide.vscode.testharness.Editor;
 import org.springframework.ide.vscode.testharness.LanguageServerHarness;
@@ -35,7 +36,7 @@ public class ManifestYamlEditorTest {
 		);
 	}
 	
-	@Test public void linterRunsOnDocumentOpenAndChange() throws Exception {
+	@Test public void reconcileRunsOnDocumentOpenAndChange() throws Exception {
 		LanguageServerHarness harness = new LanguageServerHarness(YamlLanguageServer::new);
 		harness.intialize(null);
 
@@ -58,178 +59,6 @@ public class ManifestYamlEditorTest {
 		);
 	}
 
-	@Test
-	public void toplevelCompletions() throws Exception {
-		Editor editor;
-		editor = harness.newEditor("<*>");
-		editor.assertCompletions(
-				"applications:\n"+
-				"  - <*>",
-				// ---------------
-				"buildpack: <*>",
-				// ---------------
-				"command: <*>",
-				// ---------------
-				"disk_quota: <*>",
-				// ---------------
-				"domain: <*>",
-				// ---------------
-				"domains:\n"+
-				"  - <*>",
-				// ---------------
-				"env:\n"+
-				"  <*>",
-				// ---------------
-//				"host: <*>",
-				// ---------------
-//				"hosts: \n"+
-//				"  - <*>",
-				// ---------------
-				"inherit: <*>",
-				// ---------------
-				"instances: <*>",
-				// ---------------
-				"memory: <*>",
-				// ---------------
-//				"name: <*>",
-				// ---------------
-				"no-hostname: <*>",
-				// ---------------
-				"no-route: <*>",
-				// ---------------
-				"path: <*>",
-				// ---------------
-				"random-route: <*>",
-				// ---------------
-				"services:\n"+
-				"  - <*>",
-				// ---------------
-				"stack: <*>",
-				// ---------------
-				"timeout: <*>"
-		);
-
-		editor = harness.newEditor("ranro<*>");
-		editor.assertCompletions(
-				"random-route: <*>"
-		);
-	}
-
-	@Test
-	public void nestedCompletions() throws Exception {
-		Editor editor;
-		editor = harness.newEditor(
-				"applications:\n" +
-				"  - <*>"
-		);
-		editor.assertCompletions(
-				// ---------------
-				"applications:\n" +
-				"  - buildpack: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - command: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - disk_quota: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - domain: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - domains:\n"+
-				"      - <*>",
-				// ---------------
-				"applications:\n" +
-				"  - env:\n"+
-				"      <*>",
-				// ---------------
-				"applications:\n" +
-				"  - host: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - hosts:\n"+
-				"      - <*>",
-				// ---------------
-				"applications:\n" +
-				"  - instances: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - memory: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - name: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - no-hostname: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - no-route: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - path: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - random-route: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - services:\n"+
-				"      - <*>",
-				// ---------------
-				"applications:\n" +
-				"  - stack: <*>",
-				// ---------------
-				"applications:\n" +
-				"  - timeout: <*>"
-		);
-	}
-
-	@Test
-	public void valueCompletions() throws Exception {
-		assertCompletions("disk_quota: <*>",
-				"disk_quota: 1024M<*>",
-				"disk_quota: 256M<*>",
-				"disk_quota: 512M<*>"
-		);
-		assertCompletions("memory: <*>",
-				"memory: 1024M<*>",
-				"memory: 256M<*>",
-				"memory: 512M<*>"
-		);
-		assertCompletions("no-hostname: <*>",
-				"no-hostname: false<*>",
-				"no-hostname: true<*>"
-		);
-		assertCompletions("no-route: <*>",
-				"no-route: false<*>",
-				"no-route: true<*>"
-		);
-		assertCompletions("random-route: <*>",
-				"random-route: false<*>",
-				"random-route: true<*>"
-		);
-	}
-
-	@Test
-	public void hoverInfos() throws Exception {
-		Editor editor = harness.newEditor(
-				"memory: 1G\n" +
-				"applications:\n" +
-				"  - buildpack: zbuildpack\n" +
-				"    domain: zdomain\n" +
-				"    name: foo"
-		);
-		editor.assertIsHoverRegion("memory");
-		editor.assertIsHoverRegion("applications");
-		editor.assertIsHoverRegion("buildpack");
-		editor.assertIsHoverRegion("domain");
-		editor.assertIsHoverRegion("name");
-
-		editor.assertHoverContains("memory", "Use the <code>memory</code> attribute to specify the memory limit");
-		editor.assertHoverContains("1G", "Use the <code>memory</code> attribute to specify the memory limit");
-		editor.assertHoverContains("buildpack", "use the <code>buildpack</code> attribute to specify its URL or name");
-	}
-
 	@Test
 	public void reconcileMisSpelledPropertyNames() throws Exception {
 		Editor editor;
@@ -372,6 +201,178 @@ public class ManifestYamlEditorTest {
 		editor.assertProblems(/*none*/);
 	}
 
+	@Test @Ignore
+	public void toplevelCompletions() throws Exception {
+		Editor editor;
+		editor = harness.newEditor("<*>");
+		editor.assertCompletions(
+				"applications:\n"+
+				"  - <*>",
+				// ---------------
+				"buildpack: <*>",
+				// ---------------
+				"command: <*>",
+				// ---------------
+				"disk_quota: <*>",
+				// ---------------
+				"domain: <*>",
+				// ---------------
+				"domains:\n"+
+				"  - <*>",
+				// ---------------
+				"env:\n"+
+				"  <*>",
+				// ---------------
+//				"host: <*>",
+				// ---------------
+//				"hosts: \n"+
+//				"  - <*>",
+				// ---------------
+				"inherit: <*>",
+				// ---------------
+				"instances: <*>",
+				// ---------------
+				"memory: <*>",
+				// ---------------
+//				"name: <*>",
+				// ---------------
+				"no-hostname: <*>",
+				// ---------------
+				"no-route: <*>",
+				// ---------------
+				"path: <*>",
+				// ---------------
+				"random-route: <*>",
+				// ---------------
+				"services:\n"+
+				"  - <*>",
+				// ---------------
+				"stack: <*>",
+				// ---------------
+				"timeout: <*>"
+		);
+
+		editor = harness.newEditor("ranro<*>");
+		editor.assertCompletions(
+				"random-route: <*>"
+		);
+	}
+
+	@Test @Ignore
+	public void nestedCompletions() throws Exception {
+		Editor editor;
+		editor = harness.newEditor(
+				"applications:\n" +
+				"  - <*>"
+		);
+		editor.assertCompletions(
+				// ---------------
+				"applications:\n" +
+				"  - buildpack: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - command: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - disk_quota: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - domain: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - domains:\n"+
+				"      - <*>",
+				// ---------------
+				"applications:\n" +
+				"  - env:\n"+
+				"      <*>",
+				// ---------------
+				"applications:\n" +
+				"  - host: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - hosts:\n"+
+				"      - <*>",
+				// ---------------
+				"applications:\n" +
+				"  - instances: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - memory: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - name: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - no-hostname: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - no-route: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - path: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - random-route: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - services:\n"+
+				"      - <*>",
+				// ---------------
+				"applications:\n" +
+				"  - stack: <*>",
+				// ---------------
+				"applications:\n" +
+				"  - timeout: <*>"
+		);
+	}
+
+	@Test @Ignore
+	public void valueCompletions() throws Exception {
+		assertCompletions("disk_quota: <*>",
+				"disk_quota: 1024M<*>",
+				"disk_quota: 256M<*>",
+				"disk_quota: 512M<*>"
+		);
+		assertCompletions("memory: <*>",
+				"memory: 1024M<*>",
+				"memory: 256M<*>",
+				"memory: 512M<*>"
+		);
+		assertCompletions("no-hostname: <*>",
+				"no-hostname: false<*>",
+				"no-hostname: true<*>"
+		);
+		assertCompletions("no-route: <*>",
+				"no-route: false<*>",
+				"no-route: true<*>"
+		);
+		assertCompletions("random-route: <*>",
+				"random-route: false<*>",
+				"random-route: true<*>"
+		);
+	}
+
+	@Test @Ignore
+	public void hoverInfos() throws Exception {
+		Editor editor = harness.newEditor(
+				"memory: 1G\n" +
+				"applications:\n" +
+				"  - buildpack: zbuildpack\n" +
+				"    domain: zdomain\n" +
+				"    name: foo"
+		);
+		editor.assertIsHoverRegion("memory");
+		editor.assertIsHoverRegion("applications");
+		editor.assertIsHoverRegion("buildpack");
+		editor.assertIsHoverRegion("domain");
+		editor.assertIsHoverRegion("name");
+
+		editor.assertHoverContains("memory", "Use the <code>memory</code> attribute to specify the memory limit");
+		editor.assertHoverContains("1G", "Use the <code>memory</code> attribute to specify the memory limit");
+		editor.assertHoverContains("buildpack", "use the <code>buildpack</code> attribute to specify its URL or name");
+	}
+
 	//////////////////////////////////////////////////////////////////////////////
 
 	private void assertCompletions(String textBefore, String... textAfter) throws Exception {