Remove Screen references from Point
Update test