Getting most of the tests passing