Merge pull request #2641 from alexanderwiederin/2585-preflight-test-coverage

#2585 Preflight Test Coverage

diff --cc lightning/src/ln/functional_test_utils.rs
Simple merge

diff --cc lightning/src/ln/payment_tests.rs
Simple merge

diff --cc lightning/src/ln/reload_tests.rs
Simple merge