a few more tests passing