I agree that this isn't ideal. The tests for checking the default PORT fail if we leave the env variables set since it will use the set value. I'll just unset the values in the test instead.