OK, I'll clean those tests up in a separate PR once we settle on the right approach to dealing with environment variables in these. (I do agree regarding the style, and especially about missing the unset case.)