GitLab

Makes the tests simpler in many cases and also removes the -expected
files.

Bug: 781655
Change-Id: I15957ca318c56f4904bb68bc085880e70823d202
Reviewed-on: https://chromium-review.googlesource.com/1111910
Commit-Queue: Adithya Srinivasan <adithyas@chromium.org>
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570760}