Many changes, but mostly a much greater test coverage