Removed tests that are not within scope. Added test-case for the new iterator class.