Merge "Fix cluster test warnings"