Update tests for layout changes