Static pages and basic tests
Merge branch 'sPages'