F: ScriptFileTest: add sorting-attributes test.
M: Other files: some little changes.