fix hanging tests