update test
Merge branch 'master' into static-pages
Finish static pages