Add count tests