Fixing Unit tests to have proper naming (reversed) and properly ...

...sending payment id

#2432