Refactor Rspec & page files