Fixed bug with single point ranges and refactored tests