Add tests with iterator and remove