added test for fetching categoryOptionCombo for non-default indicator: test, treat and act
refactor and added non-default-indicator caterycombooptionid fetching
fixing test for non-default-indicator fetcher