Added overlaps to location.

The tests are a little basic and incomplete