fixes win checking, refactors Scorer tests