Add some new metrics to tests