fix some es tests