Fixed tests for new layout/routes