Pass the environment into the config files
Update tests to ensure that the enviorment is passed properly, and adjust tests for the second environment argument