Improve get-new-server-payload-test