added merchant class and testing info