Add payment types and update test fixtures