and a fix to wrong import stmt; also, added bit more testing for Range handling