Improve static page tests