Fixing more doc tests