payment model updated
payment model updated
Merged with release
fixed randomly runnin tests