merchant tests fixed