Added scorer and tests