Tests and new class diagram.
Merge branch 'master' of https://github.com/montiainen/58160