Note: All of the changes to the test files in this patch are now aligned with both Chrome and Firefox.