Move env vars to environment and environment_test

@mwall might be the last one