Fix an indentation bug

And ensure test environment variables vary