Making more tests pass