Merge "CTS: fix count metric tests" into pi-dev