Fix forEach tests