Better test for categorical distribution scorer.
Make categorical scorer more efficient.