Merge pull request #1158 from jkczyz/2021-11-scorer-tests