made diagram generation test more solid
fixed merge conflicts