PROBCORE-538 Fixing broken tests