MEDIUM / New unit tests for diagram-ui + fix some