Renamed the test and change some test

BUG=623437

Review-Url: https://codereview.chromium.org/2134343003
Cr-Commit-Position: refs/heads/master@{#405366}
2 files changed