fix test dependencies + refactoring grunt tasks