Add point2 and point3 and tests