Baseline tests are based on `SubComponents`. Are `SubComponents` going away? Either way, it might be better to have baseline tests using the public API.