move counts to base tag
fix tests