Add the start of some test for the scoring stuff.

Change-Id: I7eb7b9176eb9a259d8fac0a99610f4bb3b938a51
Add a bunch of scoring tests, fix issues they found

Change-Id: I8a0fe533c59c0591c2cc4f1d8d9e7bde634bea8a