Feature/update tests

Merged Martin Schneider requested to merge feature/update-tests into master

Merge request reports