Made more tests pass.