Fixing broken tests and hack for text below scrolling