make more tests pass