Added some rspec tests
Merge branch 'static-pages'