diff --git a/tool/src/org/antlr/v4/analysis/PredictionDFAFactory.java b/tool/src/org/antlr/v4/analysis/PredictionDFAFactory.java
index 1be83282c..435cbaed9 100644
--- a/tool/src/org/antlr/v4/analysis/PredictionDFAFactory.java
+++ b/tool/src/org/antlr/v4/analysis/PredictionDFAFactory.java
@@ -298,8 +298,9 @@ public class PredictionDFAFactory {
 	 *  later when checking for ambiguous configs (it tests context suffixes).
 	 *
 	 *  TODO: change comment once I figure out if we can ignore suffixes in favor of empty/non test only
+	 *  4/11/2010 I removed suffix check from getAmbigAlts and it broke; seems I need it.
 	 *
-	 *  Side-effect warning:
+	 *  Side-effect warnings:
 	 *
 	 *  Rather than pass in a list of configs to update or return and
 	 *  collect lots of little config lists, it's more efficient to
diff --git a/tool/test/org/antlr/v4/test/TestDFAConstruction.java b/tool/test/org/antlr/v4/test/TestDFAConstruction.java
index b7bbf3272..f503db6d3 100644
--- a/tool/test/org/antlr/v4/test/TestDFAConstruction.java
+++ b/tool/test/org/antlr/v4/test/TestDFAConstruction.java
@@ -380,6 +380,7 @@ public class TestDFAConstruction extends BaseTest {
 		assertEquals(msgs.size(), 1);
 	}
 
+	/*
 	@Test public void _template() throws Exception {
 		String g =
 			"";
@@ -391,5 +392,6 @@ public class TestDFAConstruction extends BaseTest {
 		//unreachable(msgs, new int[] {2});
 		assertEquals(msgs.size(), 0);
 	}
+	 */
 
 }
diff --git a/tool/test/org/antlr/v4/test/TestNFAConstruction.java b/tool/test/org/antlr/v4/test/TestNFAConstruction.java
index cfe242af2..d80dbdfa9 100644
--- a/tool/test/org/antlr/v4/test/TestNFAConstruction.java
+++ b/tool/test/org/antlr/v4/test/TestNFAConstruction.java
@@ -378,6 +378,7 @@ public class TestNFAConstruction extends BaseTest {
 		checkRule(g, "a", expecting);
 	}
 
+/*
 	@Test public void testMultiplePredicates() throws Exception {
 		Grammar g = new Grammar(
 			"parser grammar P;\n"+
@@ -855,7 +856,7 @@ public class TestNFAConstruction extends BaseTest {
 			":s6-EOF->.s7\n";
 		checkRule(g, "a", expecting);
 	}
-
+*/
 	void checkRule(Grammar g, String ruleName, String expecting) {
 		if ( g.ast!=null && !g.ast.hasErrors ) {
 			System.out.println(g.ast.toStringTree());
diff --git a/tool/test/org/antlr/v4/test/TestPredicatedDFAConstruction.java b/tool/test/org/antlr/v4/test/TestPredicatedDFAConstruction.java
index 6c039cc55..de468dcfa 100644
--- a/tool/test/org/antlr/v4/test/TestPredicatedDFAConstruction.java
+++ b/tool/test/org/antlr/v4/test/TestPredicatedDFAConstruction.java
@@ -81,6 +81,7 @@ public class TestPredicatedDFAConstruction extends BaseTest {
 		checkRuleDFA(g, "a", expecting);
 	}
 
+	/*
 	@Test public void _template() throws Exception {
 		String g =
 			"";
@@ -92,5 +93,5 @@ public class TestPredicatedDFAConstruction extends BaseTest {
 		//unreachable(msgs, new int[] {2});
 		assertEquals(msgs.size(), 2);
 	}
-	
+	*/
 }