Gruntified tests
Merge branch 'jasmin'