Fixed the other ES tests