Test env improvements

No match.