cutover final tests to be more robust