Different score for shorter and earlier improvements for #8.

Remove some duplicate tests.