Fix failing test on environment variable

Once an ENV is set in a previous test, it must be explicitly set
to nil, otherwise it keeps its value.
Merge branch 'fix-failing-test'