Cleanup rspec tests
Finish layout and routes