Change Test folder references and variables to Import folder