Added some code to fix scores tests.