Grunt test and cleanup
Temporary workaround for done/return issue