ART tests - fixing the bugs

Marcin Wolterrequested to merge
(removed):MW_devel into master

Bugs described here: !27890 (merged) are hopefully fixed in this MR.

Merge request reports