Changes to get the tests to pass.