Update jsonp handling to stabilise tests