Make some more tests pass.