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