chore(test): Improve test setup

related to CAM-960
Merge branch 'master' of github.com:camunda/camunda-bpm-platform