Improve DEnv test (final part)