diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
index ef3a608..6e9fd6a 100644
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -373,7 +373,10 @@ public class JSONArrayTest {
         assertTrue("Array opt value out of range",
                 null == jsonArray.opt(-1));
 
-        assertTrue("Array opt boolean",
+        assertTrue("Array opt value out of range",
+                null == jsonArray.opt(jsonArray.length()));
+
+         assertTrue("Array opt boolean",
                 Boolean.TRUE == jsonArray.optBoolean(0));
         assertTrue("Array opt boolean default",
                 Boolean.FALSE == jsonArray.optBoolean(-1, Boolean.FALSE));
diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
index 08ec964..d55f5df 100644
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -1714,20 +1714,28 @@ public class JSONObjectTest {
     }
 
     /**
-     * Exercise JSONObject opt(key, default) method
+     * Exercise JSONObject opt(key, default) method.
      */
     @Test
     public void jsonObjectOptDefault() {
 
-        String str = "{\"myKey\": \"myval\"}";
+        String str = "{\"myKey\": \"myval\", \"hiKey\": null}";
         JSONObject jsonObject = new JSONObject(str);
 
+        assertTrue("optBigDecimal() should return default BigDecimal",
+                BigDecimal.TEN.compareTo(jsonObject.optBigDecimal("myKey", BigDecimal.TEN))==0);
+        assertTrue("optBigInteger() should return default BigInteger",
+                BigInteger.TEN.compareTo(jsonObject.optBigInteger("myKey",BigInteger.TEN ))==0);
         assertTrue("optBoolean() should return default boolean",
-                Boolean.TRUE == jsonObject.optBoolean("myKey", Boolean.TRUE));
-        assertTrue("optInt() should return default int",
-                42 == jsonObject.optInt("myKey", 42));
+                 jsonObject.optBoolean("myKey", true));
         assertTrue("optInt() should return default int",
                 42 == jsonObject.optInt("myKey", 42));
+        assertTrue("optEnum() should return default Enum",
+                MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
+        assertTrue("optJSONArray() should return null ",
+                null==jsonObject.optJSONArray("myKey"));
+        assertTrue("optJSONObject() should return null ",
+                null==jsonObject.optJSONObject("myKey"));
         assertTrue("optLong() should return default long",
                 42 == jsonObject.optLong("myKey", 42));
         assertTrue("optDouble() should return default double",
@@ -1736,6 +1744,36 @@ public class JSONObjectTest {
                 "hi".equals(jsonObject.optString("hiKey", "hi")));
     }
     
+    /**
+     * Exercise JSONObject opt(key, default) method when the key doesn't exist.
+     */
+    @Test
+    public void jsonObjectOptNoKey() {
+
+         JSONObject jsonObject = new JSONObject();
+
+         assertTrue("optBigDecimal() should return default BigDecimal",
+                 BigDecimal.TEN.compareTo(jsonObject.optBigDecimal("myKey", BigDecimal.TEN))==0);
+         assertTrue("optBigInteger() should return default BigInteger",
+                 BigInteger.TEN.compareTo(jsonObject.optBigInteger("myKey",BigInteger.TEN ))==0);
+         assertTrue("optBoolean() should return default boolean",
+                  jsonObject.optBoolean("myKey", true));
+         assertTrue("optInt() should return default int",
+                 42 == jsonObject.optInt("myKey", 42));
+         assertTrue("optEnum() should return default Enum",
+                 MyEnum.VAL1.equals(jsonObject.optEnum(MyEnum.class, "myKey", MyEnum.VAL1)));
+         assertTrue("optJSONArray() should return null ",
+                 null==jsonObject.optJSONArray("myKey"));
+         assertTrue("optJSONObject() should return null ",
+                 null==jsonObject.optJSONObject("myKey"));
+         assertTrue("optLong() should return default long",
+                 42 == jsonObject.optLong("myKey", 42));
+         assertTrue("optDouble() should return default double",
+                 42.3 == jsonObject.optDouble("myKey", 42.3));
+         assertTrue("optString() should return default string",
+                 "hi".equals(jsonObject.optString("hiKey", "hi")));
+    }
+    
     /**
      * Verifies that the opt methods properly convert string values.
      */