Fixed bugs that existed with testing and with scorer.py