get the tests passing again
more stuff