Log cleanup and post-testing tweaks