Improve site_layout integration test