Changed to avoid unit test hang