Get most of the tests passing again