Fix variable shadow bug, use absolute import in two integration tests.