Added iterator, test