Fix tests that failed due to configuration changes.