added merchant tests