Update some doc tests and line numbers