diff --git a/challenges/basic-javascript.json b/challenges/basic-javascript.json
index e3542ee41d..53cc76410b 100644
--- a/challenges/basic-javascript.json
+++ b/challenges/basic-javascript.json
@@ -1302,7 +1302,7 @@
         "<code>}</code>"
       ],
       "tests":[
-        "assert((function(){var data = runSlots();if(data === null){return true}else{if(data[0] === data[1] && data[1] === data[2]){return true;}else{return false;}}})(), 'If all three of our random numbers are the same we should return that number. Otherwise we should return <code>null</code>.')"
+        "assert((function(){var data = runSlots();return data === null || data.toString().length === 1;})(), 'If all three of our random numbers are the same we should return that number. Otherwise we should return <code>null</code>.')"
       ],
       "challengeSeed":[
         "fccss",
@@ -1485,9 +1485,10 @@
         "    ",
         "    // Only change code above this line.",
         "    ",
-        "    if(slotOne !== slotTwo || slotTwo !== slotThree){",
-        "      return null;",
+        "    if(slotOne === slotTwo && slotTwo === slotThree){",
+        "      return slotOne;",
         "    }",
+        "    return null;",
         "    ",
         "    if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){",
         "      $(\".logger\").html(slotOne);",
@@ -1655,9 +1656,10 @@
         "    ",
         "    // Only change code above this line.",
         "    ",
-        "    if(slotOne !== slotTwo || slotTwo !== slotThree){",
-        "      return null;",
+        "    if(slotOne === slotTwo && slotTwo === slotThree){",
+        "      return slotOne;",
         "    }",
+        "    return null;",
         "    ",
         "    if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){",
         "      $('.logger').html(slotOne);",