added and adjusted merchant tests