Tweaks to payment meta unit tests. #1835