Summary: Previously if the loop simply failed to execute the test could pass, add some minor changes to ensure control flow is as required.

Reviewed By: andriigrynenko

Differential Revision: D19960864

fbshipit-source-id: 5a437d9e7d3b7c249cbf999fe7ea5eecfe668658