MT#9067 fix tests