Rearrange configuration defaults to match unit tests.