Client config test rework

[kirkbrauer]

Yeah, I thought some of these tests might be leaky. We might want to refactor this further to avoid further problems with the tests.