Merge "Unit test log writing improvements"