Make the existing tests pass.