Deadlock problem in hunter test fixed