wip: fix EnvironmentTest errors.