query.jsonResultsAdapter fix + more tests