Merge "Rewrite integration test for wfIsBadImage()"