Refactor static pages spec
Improve static pages spec