tests update and removed Iterator and Boolean