[#eng-6544] make the tests pass with es 1.2.1
Merge pull request #59 from sonian/eng-6544-es-1.2.1

[#eng-6544] make the tests pass with es 1.2.1