Migrate package iterables + fix test