Updated tests to use :layout
Updated tests to use :layout