tests, remove JSONP, grunt work