Also one test of iteration. Added various TODOs for this branch, which currently only works on nightly.