Made more tests pass