Adding another helper to counts and updating the unit tests.