Fix scenario test failures
Fixes to websites tests
Merge pull request #1186 from ogail/1160

Fix scenario test failures