Improved handling of multiple layout placements.
Update test case.