fix tests after dir tree change and add gruntjs