6504: counters++
6504: Unit tests