merchant tests fixed
fixed: