Make some improvement on layout and routes testing
Make some improvement on layout and routes testing