I'm completely behind dropping option testing.  Will check that in ASAP.