fixed routes/tests
layouts changes