Clean up options and add UI tests.