Including min_scale as another input parameter
Adding remaining tests