Fix broken tests
Add iteration C4