Rename CharCounterSet to CounterSet and Unit Test