Refactoring to adapt to PaymentCore changes
Adapt test
Update readme