Later & Topic: Fix tests to work with latest configuration changes.