Updated tests to use :layout