Add new options and units tests.