Cleaned up ElasticSearchTestClient