Followup r99305 - change tests to match behaviour. Would set globals but restoring...