improved ES tests