GitLab

- Update some remaining tests to check both legacy and new system
- Add some missing coalescing rules in the new system

BUG=398257

Review URL: https://codereview.chromium.org/1042793003

Cr-Commit-Position: refs/heads/master@{#324068}