Tidy changes to jsonp tests
Separate document files by types of query