Reverted ScrollView functional tests to versions at Master. WIP versions can be viewed @ 9d0cf9cfcc71f9006d63774d6d09788b5a9d3f69