Adds a simple iterator and some more tests.