Refactor scoring test