Unit tests for OptionsImpl and command provider fixes/enhancements