Updates to make the tests pass.