[284426] [content assist] [exceptions] Internal error on content assist in nested function
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/BindingKeyTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/BindingKeyTests.java
index 4fed271..11a08b9 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/BindingKeyTests.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/BindingKeyTests.java
@@ -163,22 +163,12 @@
 	}
 
 	/*
-	 * Create a type binding key from a primitive type name
-	 */
-	public void test016() {
-		String key = BindingKey.createTypeBindingKey("int");
-		assertBindingKeyEquals(
-			"I",
-			key);
-	}
-
-	/*
 	 * Create a type binding key from an array type name
 	 */
 	public void test017() {
-		String key = BindingKey.createTypeBindingKey("boolean[]");
+		String key = BindingKey.createTypeBindingKey("Boolean[]");
 		assertBindingKeyEquals(
-			"[Z",
+			"[LBoolean;",
 			key);
 	}
 
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTestsRequestor.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTestsRequestor.java
index 3a8ba40..17ec125 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTestsRequestor.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTestsRequestor.java
@@ -47,11 +47,7 @@
 				fElements.addElement(new String(typeName));
 				this.acceptCommon(proposal);
 				if (fDebug) {
-					if(Signature.getTypeSignatureKind(proposal.getSignature()) == Signature.TYPE_VARIABLE_SIGNATURE) {
-						System.out.println("type parameter " + new String(typeName));
-					} else {
-						System.out.println("Class " + new String(typeName));
-					}
+					System.out.println("Class " + new String(typeName));	
 				}
 				break;
 				
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/SignatureTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/SignatureTests.java
index 338ca96..a73b93f 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/SignatureTests.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/SignatureTests.java
@@ -801,13 +801,6 @@
 }
 	
 // signatures with 1.5 elements
-
-public void testGetTypeSignatureKind15() {
-	assertEquals(
-		"Signature#getTypeSignatureKind(String) is not correct 15", 
-		Signature.TYPE_VARIABLE_SIGNATURE,
-		Signature.getTypeSignatureKind("TVAR;"));
-}
 public void testGetTypeSignatureKind16() {
 	assertEquals(
 		"Signature#getTypeSignatureKind(String) is not correct 16", 
@@ -946,12 +939,6 @@
 
 // signatures with 1.5 elements
 
-public void testGetTypeSignatureKindCharArray15() {
-	assertEquals(
-		"Signature#getTypeSignatureKind(char[]) is not correct 15", 
-		Signature.TYPE_VARIABLE_SIGNATURE,
-		Signature.getTypeSignatureKind("TVAR;".toCharArray()));
-}
 public void testGetTypeSignatureKindCharArray16() {
 	assertEquals(
 		"Signature#getTypeSignatureKind(char[]) is not correct 16",