Few minor changes to schema, test_schema and test_formats modules