Payment state machine debug and fix retry tests