Unblock some tests and fix a Loop one
Merge pull request #519 from owdqa/bug/misc_fixes

Unblock some tests and fix a Loop one