Merge "Fix testAuthNeeded test"