Issue #147: Added/updated layout tests.