Fix incorrect test numbering, caused by unintended template specialisations being created.  Fix by keeping the counters with the labels. (Bug 650883)
Fix incorrect test numbering, caused by unintended template specialisations
being created.  Fix by keeping the counters with the labels. (Bug 650883)

zmij/tip-http,zmij/tip-http,zmij/tip-http,zmij/pg_async,zmij/tip-http