Fixing tests and updating Gruntfile
Updating dist