Added a test for onOptionsChanged value.  Style cleanups.