Fix cases with equal points
Better fix for unique points, more tests