update testing spec files
Finish layouts and routes