Convert inline "if"s to "if"s with body
Don't populate configuration from environment when running tests
Prepare for v3.2