Merge "Fix test to use better flag."