fixed scorer specs
refactor a bit