Adding static pages with tests
Merge branch 'static-pages'