Cleaned up unit tests and iterators.