Fix #10814. Make support tests lazy and broken out to components.