Fix some websites tests to work in dogfood.
Merge pull request #1369 from amitapl/dev

Fix some websites tests to work in dogfood.