test refactoring
Gruntfile refactoring