Pull latest test-metrics
Improve tsTime implementation
Cleanup debug code