Fix the tests

Closed Amir MOHAMMADI requested to merge fixes into master

Merge request reports