Add Count and Measure methods for clarity
Add tests