Converted to named loops so can exit before all tests drawn