Move env variables to environment and environment_test

@mwall one more