updated/completed Merchant and Transaction tests