Merge "Fix creating of client manager for network tests"