FIX more doc tests