Fixed tests surrounding environment variables taking preference over config values