Small fix to take changes for environment into account when testing
this.