fixup! Move verification of payment requests into new class.
Unit test