Moves template, layout tests
Merge pull request #9732 from twokul/moves-more-tests

Moves template, layout tests