e9dd4876b8
Might be pushing it on test coverage, but these are some of our slowest tests we might get a significant speedup here. Part of #5713