add missing tests to Merchant
add integration tests to Merchant
added integration tests to Merchant

Merge branch 'merchant'