TST: Fix tests for layout changes