Fixing broken tests due to layout changes