Elasticsearch test case fixes.