Fixes/improvements/additions to Scrollable functional tests