Cleaning up the tests a bit
Now passes JSLint