Fix duplicate payment profile handling
Update unit tests