Fixes for the tests based on web changes.