Refactor Test Spec and headers
Finish layout and routes