Fixed ESHTest class