Merge "Disable logging to file during tests"