test fixes
removing comment
Merging origin/nihar/master-pending-scrollerUnitTestFix into master