Revert "Improve testing on static pages"

This reverts commit 25a7e8d2f59ed9630b24582a560a01155aa999f7.
Revert "Revert "Improve testing on static pages""

This reverts commit 548866119af074fffcf0953d5d4a2de231454d2c.