Add Iterator tests
restore behavior