Merge pull request #100 from mpeuster/master

Test refactoring, integration preparation, workaround for chaining bug