Add a Scorer and some tests for it