Fix tests

Get the tests running and passing again.