Test fixes for newer ES versions
Add testing note.