Making more unit tests pass.