Adding counter
Updating tests