Improve iterable test