ISAICP-7150: Fix all tests

Merged Claudiu Cristea requested to merge ISAICP-7150 into master

Merge request reports