added 2 more test scenarios for composite
fixed wrong option
Merge remote-tracking branch 'upstream/master'
added new scenario for github 327
Merge pull request #328 from hhovsepy/master

added more scenarios