fix tests
more tests pass