More development. Need to fix issue with Merchant data missing from TestCase