* Fix default payment bug
This attempts to fix the default payment bug described in #2963.
Update to complete #2986
This takes into account #2986 and @NicolasDorier 's suggestion to add a default payment type as an empty (valueless) option that is selected by default.
* Fix tests
Co-authored-by: nicolas.dorier <nicolas.dorier@gmail.com>