More unit testing
Added ValidateAndRetrieveOption to handle validation of all options