Squashed 'lib/' changes from e59d72f..f19fb40

f19fb40 Small fixes in tests for graph plotting

git-subtree-dir: lib
git-subtree-split: f19fb4013dbca9b0e874be19df892d0c59c7dd63
Merge commit 'df00620cc2be22940aac00734bd07235dba2dba6' into ellmaster