Grunt integration, more tests, etc