got all the tests passing again