new tests for PaymentImpl and some fixes