Add missing tests, fix searchAdd/Remove(obj)