let us use clean test environments

The additional typing and the duplicated code benefit cleaner test
execution. Test failures might be hidden by a dirty test environment or
random test failures might be produced by it.

Change-Id: I97283009b65facbaad82e41ae6f1258430684438