(for Evie) Fix synchronous scoring + unit tests.

@EvieGillie