Minor bugfixes in plugin definiton and PaymentTest