Cleanup, and add more info to saved test runs