Refactors next point score and adds tests for this functionality.