Fixes to tests and changes related to checkout payments for individuals