Counters done
Improve test coverage