Adjust some for loop tests