Use merge strategy for configuration().
Update configuration tests.