Fixed ordering issues in the ElasticSearch tests.