Upgraded test system for metrics.