Fix tests after adding match score