Layout specification and discovery should follow the same behavior as partials

Fixes #1047
nit: for the test classes / files you're changing, could you change them to end w/ "Test"?