Add range/first modifier in test