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