Cleanup of ScrollView functional tests