Improve and fix Loop tests