Modify existing contract tests to take early payment proofs into account - either proofs need to be explicitly turned off in code or you need to supply a receiver address, mix of both sprinkled throughout (need to think about this).
General cleanup in preparation for some more contracts/payment proof testing, to be integrated into the gui wallet in turn