Changes needed to restore Payments coverage

These changes are also from @bobsilverberg 's PR https://github.com/mozilla/marketplace-tests-gaia/pull/66