* more composition tests
* simplified composition mechanism