added env_var to emulate production
Updated tests to work with test.env_var