Update tests for B1

Merged Simon Sendler requested to merge feature/update-tests into develop

Merge request reports