Fixing timeouts in regression test