Merge branch 'static-pages'
refactor tests
Merge branch 'master' into static-pages
add contact page and tests