Increasing timeout and fixing bug (@elainethale can you verify line 947?)