903039 native options test cleanup, a=@erikvold