adjusted Test to match layout changes