Makes more tests pass