Added Layout versions of Layout1 helpers.
Switched further tests to Layout and fixed issues with modified helpers.