Fixing Payment Mock as we have to separate between Frontend and Backend
Fixing Payment Mock, typos
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fixing Payment Mock, typos
  Fixing Payment Mock as we have to separate between Frontend and Backend