Added find methods for merchant class / and tests