[TEST] payment test suite improvements