Fix tests
Take a literal json or query structure and pass it to the Elasticsearch client