diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index 3b70446..5aef340 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -346,14 +346,14 @@ public class JSONArrayTest {
             assertTrue("expected getDouble to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a number.",e.getMessage());
+                    "JSONArray[4] is not a double.",e.getMessage());
         }
         try {
             jsonArray.getInt(4);
             assertTrue("expected getInt to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a number.",e.getMessage());
+                    "JSONArray[4] is not a int.",e.getMessage());
         }
         try {
             jsonArray.getJSONArray(4);
@@ -374,14 +374,14 @@ public class JSONArrayTest {
             assertTrue("expected getLong to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[4] is not a number.",e.getMessage());
+                    "JSONArray[4] is not a long.",e.getMessage());
         }
         try {
             jsonArray.getString(5);
             assertTrue("expected getString to fail", false);
         } catch (JSONException e) {
             assertEquals("Expected an exception message",
-                    "JSONArray[5] not a string.",e.getMessage());
+                    "JSONArray[5] is not a String.",e.getMessage());
         }
     }
 
diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 3687fe5..6f04fd5 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -133,9 +133,9 @@ public class JSONMLTest {
             JSONML.toString(jsonArray);
             assertTrue("Expecting an exception", false);
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "JSONArray[0] not a string.".
-                equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                "JSONArray[0] is not a String.",
+                e.getMessage());
         }
     }
 
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 8d32649..ac67980 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -1041,7 +1041,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message", 
-                    "JSONObject[\"trueKey\"] not a string.",
+                    "JSONObject[\"trueKey\"] is not a string.",
                     e.getMessage());
         }
         try {
@@ -1057,7 +1057,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message",
-                    "JSONObject[\"stringKey\"] is not a number.",
+                    "JSONObject[\"stringKey\"] is not a double.",
                     e.getMessage());
         }
         try {
@@ -1073,7 +1073,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message",
-                    "JSONObject[\"stringKey\"] is not a number.",
+                    "JSONObject[\"stringKey\"] is not a float.",
                     e.getMessage());
         }
         try {
@@ -1089,7 +1089,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a number.",
+                    "JSONObject[\"stringKey\"] is not a int.",
                     e.getMessage());
         }
         try {
@@ -1105,7 +1105,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message", 
-                    "JSONObject[\"stringKey\"] is not a number.",
+                    "JSONObject[\"stringKey\"] is not a long.",
                     e.getMessage());
         }
         try {
@@ -2087,7 +2087,7 @@ public class JSONObjectTest {
             fail("Expected an exception");
         } catch (JSONException e) { 
             assertEquals("Expecting an exception message",
-                    "JSONObject[myKey] is not a JSONArray.",
+                    "JSONObject[\"myKey\"] is not a JSONArray (null).",
                     e.getMessage());
         }
         try {