Iterator type can be set during instantiation
Refactored testsuite
Removed duplicate test