Make more tests pass