Added stuck test handling