all but 2 tests passing