refactor how we count calls in tests