Merge "Use the same logger class in all test cases"