FIX broken scorer, add non-regression test.