Fixes, tests, Grunt setup