Fixed unit tests, 'grunt test' now passing