Get things building again, and the tests running
Fixes which get the tests passing again