composite tests
Merge remote-tracking branch 'upstream/master'
fix demo
Merge pull request #191 from patriot1burke/master

composite tests and fix distro
removing unused imports and code that is commented out; looks like was add by accident
Making those classes final that only have one private ctor, which means you can not inherit from them anyways