Add test and more refactoring
Add watch plugin to Grunt, and lint the tests properly