Make integration tests work with iteratee changes