More doc test compliance fixes