Fix error with masterCard + add tests