Bugfix/e2e tests

Merged Sven Wolter requested to merge bugfix/e2e_tests into develop

Merge request reports