Migrate test-provider to CompositeListener