Add another counter class + tests