Merge "Fix failure in scoring test caused by timeout"