Fixed Customer and Merchant Repos, tests and classes