Small refactorings.
Small refactorings.
Fixed the Gruntfile.js for Jasmine testing.