renamed GetType() to Type(), fixed iterator tests