ScoreAverager tests, minor fixes