Nicer rSpec and correct tests
Finish layout and routes