Unblock some tests and fix a Loop one