Added metrics.

Also greatly improved the test stream generation time.