#2432 - Fixing Unit tests to have proper naming (reversed) and properly sending payment id