Fix tests to reflect changed semantics in selection API.