many of the tests passing
adding a few more tests