Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
added setup for composite content views, added test method templates
until product functionality is added
implementing scenarios for content view, but for now they will fail
refactoring in content definition tests, added more scenarios
Merge remote-tracking branch 'upstream/master'
uncomment teardown
Merge pull request #318 from hhovsepy/master

added new scenarios, did refactoring