More fixes for PaymentStatus -> TransactionStatus renaming
Initiated fixing beatrix tests after major payment changes