enhance iterate tests