Made some changes to Merchant and completed all Invoice tests