updated tests and gruntfile