Test Fix

Merged Jose Luis Zanotti requested to merge 12.0-test-fix into 12.0-stage

Merge request reports