Fixed tests that called methods that were removed as a result of the switch to the IteratorAggregate interface.