Starting to add option unit test and fixing a bug.