Adding more tests to cover Segment and Location inter-dependencies