support for contains and surrounds added. tests changed to support that.