Added some tests for WordMatcher, fixed minors problems with the diagram, added preset diagram configurations.