Added grunt-watch-task and new test infrastructure