Fixing schema and doctest