Changes for some Loop tests