fixing the default diagram name failing test with a single source of truth for the name
Fixed fields sorting
Added field type feature