Fix test
Remove a TODO
Merge branch 'master' into jsonp
Change TODO