Fix for test timeout; speculative fix for failure