all tests in, plus some restructuring of the code
Merge pull request #18 from raganwald/master

Merges the remainder of the functional iterator tests