Fix variable shadow bug, use absolute import in two integration tests.
Remove executable bits on some non-executable files.