updated Gruntfile, updated tests