Fix tests, add extra tests for iterate manager