Fix skip ranges in metrics tests (#1828)