MT#4771 fix customer test, select product

see also 4871#c31665