Improved if condition for populate_create in Payment, and update fixutres for Payment.