clean up tests and improve reliability

[finishes #82340478]