isolation fixes for configuration tests
isolation fixes for configuration tests