upgraded loop tests