modified ESHtest to conform to handler