Change 14499

Shuffle up the tests to make some room for one that tests setting
and getting of client environment vars.

Also give nice names to the tests while we're there.
3 edited 5 added 4 deleted
Tip: Use n and p to cycle through the changes.