Added scorers + tests