Merge "Fix ambiguous phrasing in tests comments regarding $opt$."