diff --git a/package.json b/package.json
index b27597c4fb..c4d4b81528 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "prestart-production": "bower cache clean && bower install && gulp build && npm run build-production",
     "start-production": "node pm2Start",
     "lint": "eslint --ext=.js,.jsx .",
-    "test": "mocha"
+    "test": "mocha --compilers js:babel/register"
   },
   "license": "(BSD-3-Clause AND CC-BY-SA-4.0)",
   "contributors": [
diff --git a/public/css/main.less b/public/css/main.less
index 12ed9d14ae..60b2d3b029 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -742,6 +742,11 @@ form.code span {
   width: 99%;
 }
 
+.scroll-locker {
+  overflow-x: auto;
+  overflow-y: scroll;
+}
+
 .big-error-icon {
   font-size: 40px;
   color: @brand-danger;
diff --git a/public/js/main_0.0.3.js b/public/js/main_0.0.3.js
index 3d9f80acde..61cb831ece 100644
--- a/public/js/main_0.0.3.js
+++ b/public/js/main_0.0.3.js
@@ -333,33 +333,28 @@ $(document).ready(function() {
                     if(magiVal < 0){
                         magiVal = 0;
                     }
-                    magiVal = $(window).height()-($('.navbar').height()+$('.footer').height());
-                    if(magiVal < 0){
-                        magiVal = 0;
-                    }
                     $('.editorScrollDiv').css("height", (magiVal-85) + "px");
                 }
                 magiVal = $(window).height()-($('.navbar').height()+$('.footer').height());
                 if(magiVal < 0){
                     magiVal = 0;
                 }
-                $('.scroll-locker').css("min-height", $('.editorScrollDiv').height()).css("height",magiVal-85);
+
+                $('.scroll-locker').css("min-height", $('.editorScrollDiv').height()).css("height",magiVal-185);
             }
             else {
                 $('.editorScrollDiv').css("max-height", 500 + "px");
-                $('.scroll-locker').css('position', 'inherit').css('top', 'inherit').css('width', '100%').css('max-height', '85%').css('overflow-y', 'auto').css('overflow-x', 'hidden');
+                $('.scroll-locker').css('position', 'inherit').css('top', 'inherit').css('width', '100%').css('max-height', '85%');
             }
         }
-        if ($('.scroll-locker').offset()){
-          $(document).ready(function(){
+        if ($('.scroll-locker').html()){
             lockTop();
             $(window).on('resize', function(){
               lockTop();
             });
-            $(window).scroll(function() {
+            $(window).on('scroll', function() {
               lockTop();
             });
-          });
         }
     }
 });
diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 5d7ca67df7..678ca0d700 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -450,7 +450,7 @@
         "Let's now go create a nested array called <code>myArray</code>."
       ],
       "tests":[
-        "assert((function(){if(typeof(myArray) !== 'undefined' && typeof(myArray) === 'object' && typeof(myArray[0]) !== 'undefined' && typeof(myArray[0]) === 'object' && editor.getValue().match(/\\[(.*)?\\[/g).length >= 1 && editor.getValue().match(/\\](.*)?\\]/g).length >= 1){return(true);}else{return(false);}})(), 'myArray should contain at least one array');"
+        "assert((function(){if(typeof(myArray) !== \"undefined\" && typeof(myArray) === \"object\" && typeof(myArray[0]) !== \"undefined\" && typeof(myArray[0]) === \"object\" && editor.getValue().match(/\\[\\s?\\[/g).length >= 1 && editor.getValue().match(/\\]\\s?\\]/g).length >= 1){return(true);}else{return(false);}})(), 'myArray should contain at least one array');"
       ],
       "challengeSeed":[
         "var ourArray = [[\"the universe\", \"everything\"], 42];",
diff --git a/test/basic_routes.js b/test/basic_routes.js
index a019e072ec..ac7d190787 100644
--- a/test/basic_routes.js
+++ b/test/basic_routes.js
@@ -1,10 +1,10 @@
 var request = require('supertest');
 var app = require('../server/server.js');
 
-describe('#ROUTES', function() {
+describe('#ROUTES', function () {
 
   describe('GET /', function () {
-    it('should return 200 OK', function (done) {
+    it('should return 200 OK', (done) => {
       request(app)
         .get('/')
         .expect(200, done);
@@ -12,7 +12,7 @@ describe('#ROUTES', function() {
   });
 
   describe('GET /signin', function () {
-    it('should return 200 OK', function (done) {
+    it('should return 200 OK', (done) => {
       request(app)
         .get('/signin')
         .expect(200, done);
@@ -20,7 +20,7 @@ describe('#ROUTES', function() {
   });
 
   describe('GET /email-signup', function () {
-    it('should return 200 OK', function (done) {
+    it('should return 200 OK', (done) => {
       request(app)
         .get('/email-signup')
         .expect(200, done);
@@ -28,15 +28,15 @@ describe('#ROUTES', function() {
   });
 
   describe('GET /random-url', function () {
-    it('should return 302', function (done) {
+    it('should return 302', (done) => {
       request(app)
         .get('/reset')
         .expect(302, done);
     });
   });
 
-  describe('Get /camperName', function () {
-    it('should return 200', function (done) {
+  describe('GET /camperName', function () {
+    it('should return 200', (done) => {
       request(app)
         .get('/terakilobyte')
         .expect(200, done);