Payments test left to fix
Merge conflicts
Merge conflicts