added the merchant class and test