Fix some scorers, add some test cases.  All previous cached scores are
wrong.