some more passing tests
fix some more tests