Improve static page testing