Simplifying logic and adding tests to SpacialCoordinate