Add test to reflect #1622 behaviour
Add support for use of folders inside _layout path, closes #1622