Merge pull request #357 from marko-bekhta/test/run-with-es-8-15

Merge pull request #357 from marko-bekhta/test/run-with-es-8-15 #320