Updated Iterator tests