* Add _remaining tidy metrics. * Add two extra metrics during tidy. * Update test and documentation for remaining tidy metrics.