Clean up the tests more
[#82160500]