Add range_min and range_max parameters, test for functionality