Fixed a test and did some JSLint fixes...