Updated tests to use latest rspec features
Finish layout and routes