testbench: add new ES tests to make check

also a quick nitfix