Test fixes for Elasticsearch 1.4.x

Closes #32