Merge "Fix LogManager related tests"