make some more tests pass