Prevents defaulting CounterMax Rate Option to zero
bugfix and add tests
Merge pull request #1246 from control-center/fix/CC-394

Prevents defaulting CounterMax Rate Option to zero