update count metrics and tests