[TEST] payment test suite improvements

Really like this new syntax! A lot more DRY