Refactor static pages spec a bit