Reverted ScrollView functional tests to versions at Master