update tests for merchant