Improve TestEnv for cleaner tests
#10465
| Job | Run time |
|---|---|
| 4m 17s | |
| 6m 21s | |
| 4m 19s | |
| 4m 19s | |
| 6m 48s | |
| 4m 10s | |
| 3m 58s | |
| 7m 13s | |
| 11m 8s | |
| 4m 38s | |
| 6m 43s | |
| 10m 10s | |
| 8m 55s | |
| 4m 51s | |
| 4m 8s | |
| 8m 56s | |
| 9m 12s | |
| 4m 15s | |
| 1h 54m 21s |