change ES test mock and tests to more accurately reflect ES behavior