Merge "Fix LogManager tests"