bug 903039 - native options, test cleanup