Adding water meter counter and unit tests