better unit testing and removal of RangedData