Merge "per test_method logging"