Refactor static pages spec
More test refactroing