Feature/finalize conv test

Merged Martin Schneider requested to merge feature/finalize-conv-test into feature/update-tests

Merge request reports